diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index 110d46939..825f5a934 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -313,6 +313,7 @@ static NSCharacterSet *controlCharSet = nil;
         {
           if (i+1 < len)
             {
+              buf++;
               *(start+j) = *buf;
             }
         }
diff --git a/UI/MailerUI/UIxMailListActions.m b/UI/MailerUI/UIxMailListActions.m
index 163ead021..673de4987 100644
--- a/UI/MailerUI/UIxMailListActions.m
+++ b/UI/MailerUI/UIxMailListActions.m
@@ -186,7 +186,7 @@
   if (![subject length])
     subject = @"";
 
-  return [subject stringByEscapingHTMLString];
+  return [[subject safeString] stringByEscapingHTMLString];
 }
 
 - (BOOL) showToAddress