initial commit after Mailserver upgrade
Authored by: platz 2013-12-18
Parent: [r5690]
Child: [r5692]
