From dbf57dddf7ef07a0168ad0c1d64de0735a9c5804 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 31 Mar 2016 02:09:24 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 server/lib/classes/monitor_tools.inc.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index de8d085..9493dc6 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/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 {

--
Gitblit v1.9.1