diff --git a/lib/Newsletter/Renderer/Blocks/Image.php b/lib/Newsletter/Renderer/Blocks/Image.php
index a9641ad4b8..3f78221cea 100644
--- a/lib/Newsletter/Renderer/Blocks/Image.php
+++ b/lib/Newsletter/Renderer/Blocks/Image.php
@@ -22,9 +22,8 @@ class Image {
       $element = self::adjustImageDimensions($element, $column_base_width);
     }
 
-    $max_width = is_numeric($element['width']) ? ($element['width'] . 'px') : '100%';
     $image_template = '
-      <img style="max-width:' . $max_width . ';" src="' . $element['src'] . '"
+      <img src="' . $element['src'] . '"
       width="' . $element['width'] . '" alt="' . $element['alt'] . '"/>
       ';
     if(!empty($element['link'])) {
diff --git a/lib/Newsletter/Renderer/Template.html b/lib/Newsletter/Renderer/Template.html
index f4fcaf4887..a5bd946e5f 100644
--- a/lib/Newsletter/Renderer/Template.html
+++ b/lib/Newsletter/Renderer/Template.html
@@ -28,6 +28,7 @@
         }
         .mailpoet_image img {
             height: auto;
+            max-width: 100%;
             -ms-interpolation-mode: bicubic;
             border: 0;
             display: block;
diff --git a/tests/integration/Newsletter/RendererTest.php b/tests/integration/Newsletter/RendererTest.php
index 8b01324fb8..583e40ab4c 100644
--- a/tests/integration/Newsletter/RendererTest.php
+++ b/tests/integration/Newsletter/RendererTest.php
@@ -232,7 +232,6 @@ class RendererTest extends \MailPoetTest {
     $DOM = $this->DOM_parser->parseStr(Image::render($template, self::COLUMN_BASE_WIDTH));
     // element should be properly nested, it's width set and style applied
     expect($DOM('tr > td > img', 0)->attr('width'))->equals(620);
-    expect($DOM('tr > td > img', 0)->attr('style'))->notEmpty();
   }
 
   function testItRendersAlignedImage() {
@@ -345,7 +344,6 @@ class RendererTest extends \MailPoetTest {
     );
     $rendered_image = Image::render($image, self::COLUMN_BASE_WIDTH);
     expect($rendered_image)->contains('width="auto"');
-    expect($rendered_image)->contains('max-width:100%');
   }
 
   function testItAdjustImageDimensionsWithPx() {
@@ -359,7 +357,6 @@ class RendererTest extends \MailPoetTest {
     );
     $rendered_image = Image::render($image, self::COLUMN_BASE_WIDTH);
     expect($rendered_image)->contains('width="620"');
-    expect($rendered_image)->contains('max-width:620px');
   }
 
   function testItAdjustImageDimensionsWithoutPx() {
@@ -373,7 +370,6 @@ class RendererTest extends \MailPoetTest {
     );
     $rendered_image = Image::render($image, self::COLUMN_BASE_WIDTH);
     expect($rendered_image)->contains('width="620"');
-    expect($rendered_image)->contains('max-width:620px');
   }
 
   function testItRendersText() {