Adjusted DrupalMailParser and added mini-fix for the TextAndHtmlMailParser