Merge branch 'stable-3.1'

Marius Burkard

2016-07-01 49441bdd0f3ff75d5092d5b832b97ea722a66363

 server/plugins-available/maildeliver_plugin.inc.php

@@ -132,7 +132,7 @@

         // Custom filters
         if($data["new"]["custom_mailfilter"] == 'NULL') $data["new"]["custom_mailfilter"] = '';
         $tpl->setVar('custom_mailfilter', $data["new"]["custom_mailfilter"]);
         $tpl->setVar('custom_mailfilter', str_replace("\r\n","\n",$data["new"]["custom_mailfilter"]));

         // Move junk
         $tpl->setVar('move_junk', $data["new"]["move_junk"]);