diff --git a/lib/helpers.js b/lib/helpers.js
index 786e3473..fc57de7b 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -10,7 +10,7 @@ let fields = require('./models/fields');
 let forms = require('./models/forms');
 let _ = require('./translate')._;
 let objectHash = require('object-hash');
-let mjml = require('mjml');
+let mjml2html = require("mjml");
 let mjmlTemplates = new Map();
 let hbs = require('hbs');
 
@@ -249,7 +249,7 @@ function getMjmlTemplate(template, callback) {
     let done = source => {
         let compiled;
         try {
-            compiled = mjml.mjml2html(source);
+            compiled = mjml2html(source);
         } catch (err) {
             return callback(err);
         }
diff --git a/lib/mailer.js b/lib/mailer.js
index 4ef5ad0a..a6621b22 100644
--- a/lib/mailer.js
+++ b/lib/mailer.js
@@ -14,7 +14,8 @@ let templates = new Map();
 let htmlToText = require('html-to-text');
 let aws = require('aws-sdk');
 let objectHash = require('object-hash');
-let mjml = require('mjml');
+let mjml2html = require("mjml");
+
 
 let _ = require('./translate')._;
 let util = require('util');
@@ -136,7 +137,7 @@ function getTemplate(template, callback) {
         if (isMjml) {
             let compiled;
             try {
-                compiled = mjml.mjml2html(source);
+                compiled = mjml2html(source);
             } catch (err) {
                 return callback(err);
             }
diff --git a/lib/models/forms.js b/lib/models/forms.js
index 9550077b..22265184 100644
--- a/lib/models/forms.js
+++ b/lib/models/forms.js
@@ -4,7 +4,7 @@ let db = require('../db');
 let fs = require('fs');
 let path = require('path');
 let tools = require('../tools');
-let mjml = require('mjml');
+let mjml2html = require("mjml");
 let _ = require('../translate')._;
 
 let allowedKeys = [
@@ -368,14 +368,14 @@ function filterKeysAndValues(keysIn, valuesIn, method = 'include', prefixes = []
 function testForMjmlErrors(keys, values) {
 
     let errors = [];
-    let testLayout = '<mjml><mj-body><mj-container>{{{body}}}</mj-container></mj-body></mjml>';
+    let testLayout = '<mjml><mj-body>{{{body}}}</mj-body></mjml>';
 
     let hasMjmlError = (template, layout = testLayout) => {
         let source = layout.replace(/\{\{\{body\}\}\}/g, template);
         let compiled;
 
         try {
-            compiled = mjml.mjml2html(source);
+            compiled = mjml2html(source);
         } catch (err) {
             return err;
         }
@@ -388,7 +388,7 @@ function testForMjmlErrors(keys, values) {
     };
 
     keys.forEach((key, index) => {
-        if (key.startsWith('mail_') || key.startsWith('web_')) {
+        if ((key.startsWith('mail_') || key.startsWith('web_')) && !key.endsWith('_text')) {
 
             let template = values[index];
             let err = hasMjmlError(template);