Merge "Eliminate confusing redundancy in accmailtext"