diff --git a/packages/php/email-editor/src/Engine/Renderer/Renderer.php b/packages/php/email-editor/src/Engine/Renderer/Renderer.php
index 5426e45ab6..780433ed8e 100644
--- a/packages/php/email-editor/src/Engine/Renderer/Renderer.php
+++ b/packages/php/email-editor/src/Engine/Renderer/Renderer.php
@@ -60,12 +60,15 @@ class Renderer {
             'color' => $emailStyles['color']['text'] ?? 'inherit',
             'padding-top' => $emailStyles['spacing']['padding']['top'] ?? '0px',
             'padding-bottom' => $emailStyles['spacing']['padding']['bottom'] ?? '0px',
+            'padding-left' => $emailStyles['spacing']['padding']['left'] ?? '0px',
+            'padding-right' => $emailStyles['spacing']['padding']['right'] ?? '0px',
             'font-family' => $emailStyles['typography']['fontFamily'] ?? 'inherit',
             'line-height' => $emailStyles['typography']['lineHeight'] ?? '1.5',
             'font-size' => $emailStyles['typography']['fontSize'] ?? 'inherit',
           ],
       'body, .email_layout_wrapper'
     );
+    $templateStyles .= '.email_layout_wrapper { box-sizing: border-box;}';
     $templateStyles .= file_get_contents(dirname(__FILE__) . '/' . self::TEMPLATE_STYLES_FILE);
     $templateStyles = '<style>' . wp_strip_all_tags((string)apply_filters('mailpoet_email_renderer_styles', $templateStyles, $post)) . '</style>';
     $renderedTemplate = $this->inlineCSSStyles($templateStyles . $renderedTemplate);