diff --git a/NEWS b/NEWS
index 74184adbc..0b12abc21 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
 
 Bug fixes
  - fixed saved HTML content of draft when attaching a file
+ - fixed text nodes of HTML content handler by encoding HTML entities
 
 2.2.3 (2014-04-03)
 ------------------
diff --git a/SoObjects/Mailer/NSString+Mail.m b/SoObjects/Mailer/NSString+Mail.m
index 7e7f1fbaf..91bca78fc 100644
--- a/SoObjects/Mailer/NSString+Mail.m
+++ b/SoObjects/Mailer/NSString+Mail.m
@@ -417,7 +417,7 @@
 {
   if (!ignoreContent)
     {
-      [result appendString: [NSString stringWithCharacters: characters  length: length]];
+      [result appendString: [[NSString stringWithCharacters: characters  length: length] stringByEscapingHTMLString]];
     }
 }