diff --git a/.eslintrc.es5.json b/.eslintrc.es5.json
index ef25a45fd1..3f77b320aa 100644
--- a/.eslintrc.es5.json
+++ b/.eslintrc.es5.json
@@ -39,7 +39,6 @@
     "no-mixed-operators": 0,
     "eqeqeq": 0,
     "max-len": 0,
-    "no-trailing-spaces": 0,
     "global-require": 0,
     "no-throw-literal": 0,
     "no-extra-bind": 0,
diff --git a/assets/js/src/mp2migrator.js b/assets/js/src/mp2migrator.js
index 51d786ef3c..44b9429f87 100644
--- a/assets/js/src/mp2migrator.js
+++ b/assets/js/src/mp2migrator.js
@@ -176,7 +176,7 @@ define('mp2migrator', ['mailpoet', 'jquery'], function (mp, jQuery) {
     }
 
   };
-  
+
   /**
    * Actions to run when the DOM is ready
    */
@@ -187,7 +187,7 @@ define('mp2migrator', ['mailpoet', 'jquery'], function (mp, jQuery) {
     jQuery('#import').click(function () {
       MailPoet.MP2Migrator.startImport();
     });
-      
+
     // Stop import button
     jQuery('#stop-import').click(function () {
       MailPoet.MP2Migrator.stopImport();
@@ -202,7 +202,7 @@ define('mp2migrator', ['mailpoet', 'jquery'], function (mp, jQuery) {
     jQuery('#goto-welcome').click(function () {
       MailPoet.MP2Migrator.gotoWelcomePage();
     });
-    
+
     // Update the display
     MailPoet.MP2Migrator.updateDisplay();
   });
diff --git a/assets/js/src/newsletter_editor/behaviors/ColorPickerBehavior.js b/assets/js/src/newsletter_editor/behaviors/ColorPickerBehavior.js
index fdf2d17220..2d74513272 100644
--- a/assets/js/src/newsletter_editor/behaviors/ColorPickerBehavior.js
+++ b/assets/js/src/newsletter_editor/behaviors/ColorPickerBehavior.js
@@ -13,7 +13,7 @@ define([
 
   BL.ColorPickerBehavior = Marionette.Behavior.extend({
     onRender: function () {
-      var that = this, 
+      var that = this,
         preferredFormat = 'hex6';
       this.view.$('.mailpoet_color').each(function () {
         var $input = that.view.$(this);
@@ -41,7 +41,7 @@ define([
           move: updateColorInput,
           hide: updateColorInput
         });
-      });        
+      });
     }
   });
 });
diff --git a/assets/js/src/newsletter_editor/blocks/social.js b/assets/js/src/newsletter_editor/blocks/social.js
index 4a6d395b24..a1a042e1ea 100644
--- a/assets/js/src/newsletter_editor/blocks/social.js
+++ b/assets/js/src/newsletter_editor/blocks/social.js
@@ -79,7 +79,7 @@ define([
       });
     },
     _iconsChanged: function () {
-      App.getChannel().trigger('autoSave'); 
+      App.getChannel().trigger('autoSave');
     }
   });
 
diff --git a/assets/js/src/newsletter_editor/components/sidebar.js b/assets/js/src/newsletter_editor/components/sidebar.js
index 7ea371f541..a5e05d3c14 100644
--- a/assets/js/src/newsletter_editor/components/sidebar.js
+++ b/assets/js/src/newsletter_editor/components/sidebar.js
@@ -273,7 +273,7 @@ define([
 
         var view = this.previewView.render();
         this.previewView.$el.css('height', '100%');
- 
+
         MailPoet.Modal.popup({
           template: '',
           element: this.previewView.$el,