Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into st...

Till Brehm

2016-04-22 bdd3acf347ab5bf48fac98f0eed7106cdd4ded3d

 interface/web/mail/mail_user_edit.php

@@ -209,7 +209,7 @@

      // Set Maildir format
      if ($this->id == 0) {
         $this->dataRecord['maildir_format'] = $sys_config['maildir_format'];
         $this->dataRecord['maildir_format'] = $mail_config['maildir_format'];
      }
      else {
         // restore Maildir format