diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
index 53adfc88b..580da808e 100644
--- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
+++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
@@ -24,6 +24,7 @@ use Thelia\Core\Template\ParserContext;
 use Thelia\Core\Template\TemplateDefinition;
 use Imagine\Exception\InvalidArgumentException;
 use Thelia\Core\Translation\Translator;
+use Thelia\Model\ConfigQuery;
 
 /**
  *
@@ -95,14 +96,115 @@ class SmartyParser extends Smarty implements ParserInterface
         // The default HTTP status
         $this->status = 200;
 
-        $this->registerFilter('output', array($this, "removeBlankLines"));
-        //$this->loadFilter('output', "trimwhitespace");
+        $this->registerFilter('output', array($this, "trimWhitespaces"));
         $this->registerFilter('variable', array(__CLASS__, "theliaEscape"));
     }
 
-    public function removeBlankLines($tpl_source, \Smarty_Internal_Template $template)
+    /**
+     * Trim whitespaces from the HTML output, preserving required ones in pre, textarea, javascript.
+     * This methois uses 3 levels of trimming :
+     *
+     *    - 0 : whitespaces are not trimmed, code remains as is.
+     *    - 1 : only blank lines are trimmed, code remains indented and human-readable (the default)
+     *    - 2 or more : all unnecessary whitespace are removed. Code is very hard to read.
+     *
+     * The trim level is defined by the configuration variable html_output_trim_level
+     *
+     * @param string $source the HTML source
+     * @param \Smarty_Internal_Template $template
+     * @return string
+     */
+    public function trimWhitespaces($source, \Smarty_Internal_Template $template)
     {
-        return preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $tpl_source);
+        $compressionMode = ConfigQuery::read('html_output_trim_level', 1);
+
+        if ($compressionMode == 0) {
+            return $source;
+        }
+
+        $store = array();
+        $_store = 0;
+        $_offset = 0;
+
+        // Unify Line-Breaks to \n
+        $source = preg_replace("/\015\012|\015|\012/", "\n", $source);
+
+        // capture Internet Explorer Conditional Comments
+        if ($compressionMode == 1) {
+            $expressions = array(
+                // remove spaces between attributes (but not in attribute values!)
+                '#(([a-z0-9]\s*=\s*(["\'])[^\3]*?\3)|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \4',
+                '/(^[\n]*|[\n]+)[\s\t]*[\n]+/' => "\n"
+            );
+        }
+        else if ($compressionMode >= 2) {
+            if (preg_match_all('#<!--\[[^\]]+\]>.*?<!\[[^\]]+\]-->#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+                foreach ($matches as $match) {
+                    $store[] = $match[0][0];
+                    $_length = strlen($match[0][0]);
+                    $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+                    $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
+
+                    $_offset += $_length - strlen($replace);
+                    $_store++;
+                }
+            }
+
+            // Strip all HTML-Comments
+            // yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124
+            $source = preg_replace( '#<!--.*?-->#ms', '', $source );
+
+            $expressions = array(
+                // replace multiple spaces between tags by a single space
+                // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
+                '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s' => '\1 \2',
+                // remove spaces between attributes (but not in attribute values!)
+                '#(([a-z0-9]\s*=\s*(["\'])[^\3]*?\3)|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \4',
+                // note: for some very weird reason trim() seems to remove spaces inside attributes.
+                // maybe a \0 byte or something is interfering?
+                '#^\s+<#Ss' => '<',
+                '#>\s+$#Ss' => '>',
+
+            );
+        }
+        else {
+            $expressions = array();
+        }
+
+        // capture html elements not to be messed with
+        $_offset = 0;
+        if (preg_match_all('#<(script|pre|textarea)[^>]*>.*?</\\1>#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $store[] = $match[0][0];
+                $_length = strlen($match[0][0]);
+                $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+                $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
+
+                $_offset += $_length - strlen($replace);
+                $_store++;
+            }
+        }
+
+        $source = preg_replace( array_keys($expressions), array_values($expressions), $source );
+        // note: for some very weird reason trim() seems to remove spaces inside attributes.
+        // maybe a \0 byte or something is interfering?
+        // $source = trim( $source );
+
+        // capture html elements not to be messed with
+        $_offset = 0;
+        if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $store[] = $match[0][0];
+                $_length = strlen($match[0][0]);
+                $replace = array_shift($store);
+                $source = substr_replace($source, $replace, $match[0][1] + $_offset, $_length);
+
+                $_offset += strlen($replace) - $_length;
+                $_store++;
+            }
+        }
+
+        return $source;
     }
 
     /**
diff --git a/setup/insert.sql b/setup/insert.sql
index f7217a52f..59e546512 100644
--- a/setup/insert.sql
+++ b/setup/insert.sql
@@ -35,6 +35,7 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('pdf_invoice_file', 'invoice', 0, 0, NOW(), NOW()),
 ('pdf_delivery_file', 'delivery', 0, 0, NOW(), NOW()),
 ('unknown-flag-path','assets/img/flags/unknown.png', 0, 0, NOW(), NOW()),
+('html_output_trim_level','1', 0, 0, NOW(), NOW()),
 
 ('session_config.default', '1', 1, 1, NOW(), NOW()),
 ('default_lang_without_translation', '1', 1, 1, NOW(), NOW()),
@@ -80,7 +81,8 @@ INSERT INTO `config_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `pos
 (25, 'en_US', 'Base URL of the shop (e.g. http://www.yourshopdomain.com)', NULL, NULL, NULL),
 (26, 'en_US', 'Name of the invoice view in the current PDF template (without extension)', NULL, NULL, NULL),
 (27, 'en_US', 'Name of the delivery view in the current PDF template (without extension)', NULL, NULL, NULL),
-(28, 'en_US', 'The path (relative to the default back-office template) to the image used when no flag image can be found for a country', NULL, NULL, NULL);
+(28, 'en_US', 'The path (relative to the default back-office template) to the image used when no flag image can be found for a country', NULL, NULL, NULL),
+(29, 'en_US', 'Whitespace trim level of the generated HTML code (0 = none, 1 = medium, 2 = maximum)', NULL, NULL, NULL);
 
 INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namespace`, `created_at`, `updated_at`) VALUES
 (1, 'TheliaDebugBar', 1, 1, 1, 'TheliaDebugBar\\TheliaDebugBar', NOW(), NOW()),
diff --git a/setup/update/2.0.3.sql b/setup/update/2.0.3.sql
index 05993427a..39a35b9dc 100644
--- a/setup/update/2.0.3.sql
+++ b/setup/update/2.0.3.sql
@@ -200,4 +200,12 @@ CREATE TABLE `brand_image`
 ALTER TABLE `product` ADD `brand_id` INTEGER DEFAULT 0 AFTER `template_id`;
 ALTER TABLE `product` ADD CONSTRAINT `fk_product_brand` FOREIGN KEY (`brand_id`) REFERENCES `brand` (`id`) ON DELETE SET NULL;
 
+INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updated_at`) VALUES
+  ('html_output_trim_level','1', 0, 0, NOW(), NOW());
+
+SELECT @max := MAX(`id`) FROM `config`;
+INSERT INTO `config_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES
+  (@max, 'en_US', 'Whitespace trim level of the generated HTML code (0 = none, 1 = medium, 2 = maximum)', NULL, NULL, NULL);
+
+
 SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file