diff --git a/.cmds b/.cmds
index 961e818d9..7c315e57f 100644
--- a/.cmds
+++ b/.cmds
@@ -15,5 +15,5 @@ webpack --color --watch
 
 #
 gpg --import x
-gpg --detach-sign --armor --openpgp -u 87DA4591 x
-for ff in `ls *.zip`; do gpg --detach-sign --armor --openpgp -u 87DA4591 $ff; done
+gpg --detach-sign --armor --openpgp -u 87DA4591 --passphrase ?? x
+for ff in `ls ./build/dist/releases/**/**/*.zip | xargs`; do gpg --detach-sign --no-tty --yes --armor --openpgp -u 87DA4591 --passphrase ?? $ff; done
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
index f8c92f068..5c1134162 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
@@ -60,46 +60,45 @@
 						data-bind="value: filterRaw, valueUpdate: 'afterkeydown'"></textarea>
 				</div>
 			</div>
-			<div>
+			<div data-bind="visible: inited() && (!filterRaw.active() || !filterRaw.active())">
 				<div class="filters-list-top-padding"></div>
-					<table class="table table-hover list-table filters-list g-ui-user-select-none"
-						data-bind="visible: inited() && (!filterRaw.active() || !filterRaw.active()), i18nUpdate: filters">
-						<colgroup>
-							<col style="width: 30px" />
-							<col style="width: 16px" />
-							<col />
-							<col style="width: 140px" />
-							<col style="width: 1%" />
-						</colgroup>
-						<tbody data-bind="foreach: filters" style="width: 600px">
-							<tr class="filter-item" draggable="true" data-bind="sortableItem: { list: $root.filters }">
-								<td>
-									<span class="disabled-filter" data-bind="click: function () { $root.haveChanges(true); enabled(!enabled()); }">
-										<i data-bind="css: {'icon-checkbox-checked': enabled, 'icon-checkbox-unchecked': !enabled()}"></i>
-									</span>
-								</td>
-								<td class="drag-wrapper">
-									<i class="icon-braille drag-handle"></i>
-								</td>
-								<td class="e-action">
-									<span class="filter-name" data-bind="text: name()"></span>
-									&nbsp;&nbsp;
-									<span class="filter-sub-name" data-bind="text: nameSub()"></span>
-								</td>
-								<td>
-									<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oFilter) { $root.deleteFilter(oFilter); }">
-										<span class="i18n" data-i18n="SETTINGS_FILTERS/DELETING_ASK"></span>
-									</a>
-								</td>
-								<td>
-									<span class="delete-filter" data-bind="visible: !deleteAccess() && canBeDeleted(), click: function (oFilter) { $root.filterForDeletion(oFilter); }">
-										<i class="icon-trash"></i>
-									</span>
-								</td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
+				<table class="table table-hover list-table filters-list g-ui-user-select-none"
+					data-bind="i18nUpdate: filters">
+					<colgroup>
+						<col style="width: 30px" />
+						<col style="width: 16px" />
+						<col />
+						<col style="width: 140px" />
+						<col style="width: 1%" />
+					</colgroup>
+					<tbody data-bind="foreach: filters" style="width: 600px">
+						<tr class="filter-item" draggable="true" data-bind="sortableItem: { list: $root.filters }">
+							<td>
+								<span class="disabled-filter" data-bind="click: function () { $root.haveChanges(true); enabled(!enabled()); }">
+									<i data-bind="css: {'icon-checkbox-checked': enabled, 'icon-checkbox-unchecked': !enabled()}"></i>
+								</span>
+							</td>
+							<td class="drag-wrapper">
+								<i class="icon-braille drag-handle"></i>
+							</td>
+							<td class="e-action">
+								<span class="filter-name" data-bind="text: name()"></span>
+								&nbsp;&nbsp;
+								<span class="filter-sub-name" data-bind="text: nameSub()"></span>
+							</td>
+							<td>
+								<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oFilter) { $root.deleteFilter(oFilter); }">
+									<span class="i18n" data-i18n="SETTINGS_FILTERS/DELETING_ASK"></span>
+								</a>
+							</td>
+							<td>
+								<span class="delete-filter" data-bind="visible: !deleteAccess() && canBeDeleted(), click: function (oFilter) { $root.filterForDeletion(oFilter); }">
+									<i class="icon-trash"></i>
+								</span>
+							</td>
+						</tr>
+					</tbody>
+				</table>
 			</div>
 		</div>
 	</div>
diff --git a/tasks/config.js b/tasks/config.js
index 8fa928640..7c7fde903 100644
--- a/tasks/config.js
+++ b/tasks/config.js
@@ -19,7 +19,7 @@ const config = {
 	cleanPath: '',
 	zipSrcPath: '',
 	zipFile: '',
-	zipFileShort: '',
+	// zipFileShort: '',
 
 	paths: {}
 };
diff --git a/vendors/bootstrap/less/code.less b/vendors/bootstrap/less/code.less
index 58bf04102..8a1ccc333 100644
--- a/vendors/bootstrap/less/code.less
+++ b/vendors/bootstrap/less/code.less
@@ -31,9 +31,6 @@ pre {
   margin: 0 0 @baseLineHeight / 2;
   font-size: @baseFontSize - 1; // 14px to 13px
   line-height: @baseLineHeight;
-  word-break: break-all;
-  word-wrap: break-word;
-  white-space: pre;
   white-space: pre-wrap;
   background-color: #f5f5f5;
   border: 1px solid rgba(0,0,0,.15);