From 4432e461a0aad7d19654268d7aba3f116a08b0e1 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Fri, 26 Jul 2019 11:48:39 -0600
Subject: [PATCH] Mail - avoid blank line at the top of merged emails

---
 mail/inc/class.mail_compose.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 99c54b4a4d..8f7d19b9c8 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -1187,7 +1187,8 @@ class mail_compose
 				$content['body'] = $font_span.$before.($content['mimeType'] == 'html'?$sigText:$this->convertHTMLToText($sigText,true,true)).$inbetween.$content['body'];
 			}
 		}
-		else
+		// Skip this part if we're merging, it would add an extra line at the top
+		else if ($actionToProcess != 'merge')
 		{
 			$content['body'] = ($font_span?($isFirstLoad === "switchedplaintohtml"?$font_part:$font_span):/*($content['mimeType'] == 'html'?'&nbsp;':'')*/'').$content['body'].($isFirstLoad === "switchedplaintohtml"?"</span>":"");
 		}