Merge "Null check result from EmlMessageLoader" into ub-mail-master