Merge "Log when appropriate if email delivery is skipped"