Merge pull request #402 from leider/master

Threaded Mails View again pretty and many small tweaks #400