Merge "More use of EmailAsyncTask"