Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 eca13b968042fe7c21a5a01daaf1e1dffd3a83c6

 server/lib/classes/monitor_tools.inc.php

@@ -711,7 +711,10 @@
         }
         if($inHeader == true) {
            $parts = explode(':', $lines[$l], 2);
            if(strtolower($parts[0]) == 'subject') $mailSubject = trim($parts[1]);
            if(strtolower($parts[0]) == 'subject') {
               $mailSubject = trim($parts[1]);
               continue;
            }
            unset($parts);
            $mailHeaders .= trim($lines[$l]) . "\n";
         } else {