diff --git a/NEWS b/NEWS
index 85e0a0781..94e889632 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@
 Enhancements
  - [web] updated CKEditor to version 4.6.0
 
+Bug fixes
+ - [web] restore attributes when rewriting base64-encoded img tags (#3814)
+
 3.2.2 (2016-11-23)
 ------------------
 
diff --git a/SoObjects/Mailer/NSString+Mail.m b/SoObjects/Mailer/NSString+Mail.m
index c2e5f4e04..523953311 100644
--- a/SoObjects/Mailer/NSString+Mail.m
+++ b/SoObjects/Mailer/NSString+Mail.m
@@ -289,7 +289,7 @@
           //
           if ([value length] > 5 && [[value substringToIndex: 5] caseInsensitiveCompare: @"data:"] == NSOrderedSame)
             {
-              NSString *uniqueId, *mimeType, *encoding;
+              NSString *uniqueId, *mimeType, *encoding, *attrName;
               NGMimeBodyPart *bodyPart;
               NGMutableHashMap *map;
               NSData *data;
@@ -344,8 +344,21 @@
               [body release];
           
               [images addObject: bodyPart];
+
+              [result appendFormat: @"<img src=\"cid:%@\" type=\"%@\"", uniqueId, mimeType];
+
+              // Restore img attributes
+              for (i = 0; i < [attributes count]; i++)
+                {
+                  attrName = [[attributes rawNameAtIndex: i] lowercaseString];
+                  if (![attrName isEqualToString: @"src"] && ![attrName isEqualToString: @"type"])
+                    {
+                      value = [attributes valueAtIndex: i];
+                      [result appendFormat: @" %@=\"%@\"", attrName, value];
+                    }
+                }
           
-              [result appendFormat: @"<img src=\"cid:%@\" type=\"%@\"/>", uniqueId, mimeType];
+              [result appendString: @"/>"];
             }
         }
       else if (voidTags)