Merge "Set sender email in messageinfo" into jb-ub-mail-ur8