Fix a bug with saving emails to MC