271c271,272
<         'html' => t('HTML')
---
>         'html' => t('HTML'),
>         'wysiwyg' => t('<a href="http://drupal.org/project/wysiwyg">Wysiwyg</a>')  // wysiwyg diff: option to use wysiwyg editor
304c304
<   $form['body'] = array(
---
>   $form['body']['body'] = array(
310,311c310,330
<   
<   
---
> 
>       // TODO: COPIED FROM FURTHER DOWN FILE - SHOULD BE PROMOTED TO ITS OWN FUNCTION
>       // figure out the email format
>       if($_webmail_plus_config->email_format_override) {
> 
>         if(!$_webmail_plus_user_preferences->email_format) {
>           $email_format = $_webmail_plus_config->email_format;
>         }
>         else {
>           $email_format = $_webmail_plus_user_preferences->email_format;
>         }
> 
>       }
>       else {
>         $email_format = $_webmail_plus_config->email_format;
>       }
> 
>   // TODO: should filter_form() load a default?
>   if ($email_format == 'wysiwyg') {
>     $form['body']['format'] = filter_form();  // wysiwyg diff: should return default format
>   }
658a678,686
>         $mail->WordWrap   = 50; // set word wrap
> 
>       // TODO: the plain text alternative isnt converting "<br />" to "/n" as it should
>       } else if($email_format == 'wysiwyg') {  // wysiwyg diff: allow a third email format
>         //drupal_set_message('message is wysiwyg');
>         $mail->MsgHTML($form_state['values']['body']);
>         $mail->IsHTML(true); // send as HTML
> //        $mail->AltBody    = $form_state['values']['body'];
>         $mail->Body       = $form_state['values']['body'];