Merge "Fix height of to/from/cc/bcc" into jb-ub-mail