Removed overwritten mail method and explicitely

removed html parts while collecting if the
Setting only permits plain text mails

This change ensures we can call the mail
method passing a block or parameters.