Merge "My change to this file was lost; we don't care about folders width for senders" into jb-ub-mail-ur8