Merged revisons 3687-3748 from 3.0.5 stable branch.

tbrehm

2013-01-03 10b4c85a7686da07bddb5779f8ceea48acdf412e

 interface/web/mail/mail_user_edit.php

@@ -117,6 +117,12 @@
         $app->tpl->setVar("ar_active", '');
      }
      
      if($this->dataRecord['autoresponder_subject'] == '') {
         $app->tpl->setVar('autoresponder_subject', $app->tform->lng('autoresponder_subject'));
      } else {
         $app->tpl->setVar('autoresponder_subject', $this->dataRecord['autoresponder_subject']);
      }
		
    $app->uses('getconf');
    $mail_config = $app->getconf->get_global_config('mail');
      if($mail_config["enable_custom_login"] == "y") {