From 5577753be74bae810134f1fbd5ae98970bbdab70 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 9 Jun 2016 15:00:11 +0200
Subject: [PATCH] Fixed margin property for blockquote inline replacement (use
 same as in css).

---
 app/models/channel/email_build.rb | 2 +-
 test/unit/email_build_test.rb     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/channel/email_build.rb b/app/models/channel/email_build.rb
index 22c8082ca..8762d2591 100644
--- a/app/models/channel/email_build.rb
+++ b/app/models/channel/email_build.rb
@@ -241,7 +241,7 @@ Add/change markup to display html in any mail client nice.
   def self.html_mail_client_fixes(html)
 
     # https://github.com/martini/zammad/issues/165
-    new_html = html.gsub('<blockquote type="cite">', '<blockquote type="cite" style="border-left: 2px solid blue; margin: 0px; padding: 8px 12px 8px 12px;">')
+    new_html = html.gsub('<blockquote type="cite">', '<blockquote type="cite" style="border-left: 2px solid blue; margin: 0 0 16px; padding: 8px 12px 8px 12px;">')
     new_html.gsub!('<p>', '<p style="margin: 0;">')
     new_html
   end
diff --git a/test/unit/email_build_test.rb b/test/unit/email_build_test.rb
index 4c592a347..23d3b80bd 100644
--- a/test/unit/email_build_test.rb
+++ b/test/unit/email_build_test.rb
@@ -177,13 +177,13 @@ text
     html_with_fixes = Channel::EmailBuild.html_mail_client_fixes(html_raw)
     assert_not_equal(html_with_fixes, html_raw)
 
-    html_should = '<blockquote type="cite" style="border-left: 2px solid blue; margin: 0px; padding: 8px 12px 8px 12px;">some
+    html_should = '<blockquote type="cite" style="border-left: 2px solid blue; margin: 0 0 16px; padding: 8px 12px 8px 12px;">some
 text
 </blockquote>
 
 123
 
-<blockquote type="cite" style="border-left: 2px solid blue; margin: 0px; padding: 8px 12px 8px 12px;">some
+<blockquote type="cite" style="border-left: 2px solid blue; margin: 0 0 16px; padding: 8px 12px 8px 12px;">some
 text
 </blockquote>'
     assert_equal(html_should, html_with_fixes)