Mail archiving cleanup
Adaption to new github repository name.
Merge commit 'af598a7feadeeb3edccad7fca906ab66122076e4'
Merge pull request #345 from NicoleRauch/master

Minor cleanup stuff.