Merge mail enhancments by Douglas:
Douglas Cerna 2010-02-15 Changed the SMTPDataError message id
Douglas Cerna 2010-02-03 Formatted email form notifications (#497492)
Douglas Cerna 2010-02-03 Handled SMTPDataError exceptions
Douglas Cerna 2010-01-31 Handled empty required fields in the Send Test view