diff --git a/SoObjects/Mailer/NSString+Mail.m b/SoObjects/Mailer/NSString+Mail.m
index 038274dcd..ba88726dc 100644
--- a/SoObjects/Mailer/NSString+Mail.m
+++ b/SoObjects/Mailer/NSString+Mail.m
@@ -262,6 +262,7 @@
            attributes: (id <SaxAttributes>) attributes
 {
   NSString *tagName;
+  BOOL appendElement = YES;
 
   showWhoWeAre();
 
@@ -381,9 +382,11 @@
                 }
 
               [result appendString: @"/>"];
+
+              appendElement = NO;
             }
         }
-      else if (voidTags)
+      if (appendElement && voidTags)
         {
           NSString *type;
           int i;