Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2014-11-27 b553b2bf146cf20bd3ddfeba52ec5cc5b70a1da9

 server/plugins-available/maildeliver_plugin.inc.php

@@ -131,6 +131,7 @@
         $tpl->setLoop('ccloop', $tmp_addresses_arr);

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

         // Move junk