diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
index 3ef9846b7..7ec116d64 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
@@ -497,7 +497,7 @@ abstract class HtmlUtils
 
 				if (\count($aStyles))
 				{
-					$sStyles .= $sStyles . '; ' . \implode('; ', $aStyles);
+					$sStyles .= '; ' . \implode('; ', $aStyles);
 				}
 			}
 
@@ -514,6 +514,11 @@ abstract class HtmlUtils
 			else if ('table' === $sTagNameLower && $oElement->hasAttribute('width'))
 			{
 				$aAttrsForRemove[] = 'width';
+				$sWidth = $oElement->getAttribute('width');
+				if (\ctype_digit($sWidth)) {
+					$sWidth .= 'px';
+				}
+				$sStyles .= "; max-width:{$sWidth}";
 			}
 
 			if ($oElement->hasAttributes() && isset($oElement->attributes) && $oElement->attributes)