Rebased rc/mail branch

I cleaned up the history a little bit and used upper chars at the beginning of the commit-msg :)