New Mail layout. See #117