Fixed another issue with Yosemite attribution fix

robertklep · Oct 20, 2014 · ffc2bd1 · ffc2bd1
1 parent b1eb1dc
commit ffc2bd1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/quotefix/attribution.py b/quotefix/attribution.py
@@ -176,7 +176,10 @@ def customize_attribution(cls, original, editor, dom, reply, inreplyto, template
         import platform
         osversion = platform.mac_ver()[0]
         if osversion.startswith('10.10'):
-            html = re.sub(r'(?i)(<blockquote.*?>)(.*?)(<br.*?>)', r'\2\3\1', html, count = 1)
+            # move <blockquote> one level down
+            html = re.sub(r'(?i)(<blockquote.*?>)(.*?)(<br.*?>)', r'\2\1', html, count = 1)
+            # remove trailing whitespace after <blockquote>
+            html = re.sub(r'(?i)(<blockquote.*?>)(<br.*?>)+',     r'\1',   html, count = 1)
 
         # Special case: Mail doesn't include an attribution for Send Again messages,
         # so we'll just add a customized attribution right after the <body> element.