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

Marius Burkard

2016-04-20 c5c7a913f16f5ddbf4ff44d6db7bdfcd650cecaa

 server/plugins-available/mail_plugin.inc.php

@@ -247,7 +247,7 @@
         $mailHeaders     .= "Content-Type: text/html; charset=utf-8" . "\n";
         $mailHeaders     .= "Content-Transfer-Encoding: quoted-printable" . "\n";
      } else {
         $mailHeaders     .= "Content-type: text/plain; charset=utf-8" . "\n";
         $mailHeaders     .= "Content-Type: text/plain; charset=utf-8" . "\n";
         $mailHeaders     .= "Content-Transfer-Encoding: 8bit" . "\n";
      }
      $mailHeaders     .= "From: $welcome_mail_from" . "\n";