Merge pull request #2210 from ktsaou/master

MIME encoded / multipart / text and html email notifications;