Merge pull request #141 from PonteIneptique/master

New Mail layout. See #117