diff --git a/include/class.format.php b/include/class.format.php
index 6058142d8c0adb2b51e996943f2ac1562d60b647..ecd44bb16ab2246bff61579f10e946bc1d9f076f 100644
--- a/include/class.format.php
+++ b/include/class.format.php
@@ -306,8 +306,9 @@ class Format {
                   ':<!DOCTYPE[^>]+>:',          # <!DOCTYPE ... >
                   ':<\?[^>]+>:',                # <?xml version="1.0" ... >
                   ':<html[^>]+:i',              # drop html attributes
+                  ':<(a|span) (name|style)="(mso-bookmark\:)?_MailEndCompose">(.+)?<\/(a|span)>:', # Drop _MailEndCompose
             ),
-            array('', '', '', '', '<html'),
+            array('', '', '', '', '<html', '$4'),
             $html);
 
         // HtmLawed specific config only