diff --git a/dev/Component/AbstractCheckbox.js b/dev/Component/AbstractCheckbox.js
index 146d73eaa..e84824299 100644
--- a/dev/Component/AbstractCheckbox.js
+++ b/dev/Component/AbstractCheckbox.js
@@ -27,7 +27,6 @@ class AbstractCheckbox extends AbstractComponent {
 		this.inline = !!params.inline;
 
 		this.labeled = undefined !== params.label;
-		this.labelAnimated = !!params.labelAnimated;
 	}
 
 	click() {
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
index 7b3a51ab1..bf7f94225 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
@@ -10,8 +10,8 @@
 					<div class="input-append">
 						<input required="" type="text" class="input-block-level inputLogin"
 							autofocus="" autocomplete="username" autocorrect="off" autocapitalize="off" spellcheck="false"
-							data-i18n="[placeholder]LOGIN/LABEL_LOGIN"
-							data-bind="textInput: login, disable: submitRequest" />
+							data-bind="textInput: login, disable: submitRequest"
+							data-i18n="[placeholder]LOGIN/LABEL_LOGIN" />
 						<span class="add-on">
 							<i class="fontastic">👤</i>
 						</span>
@@ -21,19 +21,20 @@
 					<div class="input-append">
 						<input required="" type="password" class="input-block-level inputPassword"
 							autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
-							data-i18n="[placeholder]LOGIN/LABEL_PASSWORD"
-							data-bind="textInput: password, disable: submitRequest" />
-						<span class="add-on" tabindex="-1" data-bind="command: submitCommand" data-i18n="[title]LOGIN/BUTTON_LOGIN">
+							data-bind="textInput: password, disable: submitRequest"
+							data-i18n="[placeholder]LOGIN/LABEL_PASSWORD" />
+						<span class="add-on" tabindex="-1"
+							data-bind="command: submitCommand" data-i18n="[title]LOGIN/BUTTON_LOGIN">
 							<i class="fontastic" data-bind="visible: '' === password()">🔑</i>
 							<button type="submit" class="btn-submit-icon-wrp login-submit-icon fontastic" data-bind="visible: '' !== password()">❯</button>
 						</span>
 					</div>
 				</div>
+				<div id="plugin-Login-BottomControlGroup"></div>
 				<div class="controls" data-bind="hidden: hideSubmitButton">
 					<button type="submit" class="btn btn-large btn-block buttonLogin"
 						data-bind="command: submitCommand"
-						data-i18n="LOGIN/BUTTON_LOGIN">
-					</button>
+						data-i18n="LOGIN/BUTTON_LOGIN"></button>
 				</div>
 			</form>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html b/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
index 41a93e366..d07ccb4ae 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
@@ -1,6 +1,6 @@
 <span class="e-component e-checkbox inline" tabindex="0" data-bind="click: click, onSpace: click, css: { 'disabled': disable() || !enable() }">
 	<i role="checkbox" class="e-checkbox-icon fontastic" data-bind="text: value() ? '☑' : '☐'"></i>
 <!-- ko if: labeled -->
-	<span class="sub-label" data-bind="attr: {'data-i18n': label}, css: {'i18n-animation': labelAnimated}"></span>
+	<span class="sub-label" data-bind="attr: {'data-i18n': label}"></span>
 <!-- /ko -->
 </span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html b/snappymail/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
index 59cc63d20..c1975b3de 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
@@ -5,6 +5,6 @@
 			'box': animationBox, 'checkmark': animationCheckmark}"></div>
 	</div>
 <!-- ko if: labeled -->
-	<span class="sub-label" data-bind="attr: {'data-i18n': label}, css: {'i18n-animation': labelAnimated}"></span>
+	<span class="sub-label" data-bind="attr: {'data-i18n': label}"></span>
 <!-- /ko -->
 </span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
index e423b1aa6..7723af6a4 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
@@ -6,18 +6,14 @@
 		<div class="alert" data-bind="hidden: !submitError()" hidden="">
 			<button type="button" class="close" data-bind="click: function () { submitError('') }">×</button>
 			<span data-bind="text: submitError"></span>
-			<div data-bind="visible: '' !== submitErrorAddidional()">
-				<br />
-				<span data-bind="text: submitErrorAddidional"></span>
-			</div>
+			<p data-bind="visible: '' !== submitErrorAddidional(), text: submitErrorAddidional"></p>
 		</div>
 		<div class="wrapper-parent">
 			<form class="wrapper submitting-pane loginForm" action="#/"
 				data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
 				<div class="controls" data-bind="css: {'error': emailError}">
 					<div class="input-append">
-						<input required="" type="text" class="input-block-level inputEmail"
-							pattern="[^@\s]+(@[^\s]+)?" inputmode="email"
+						<input required="" type="text" class="input-block-level inputEmail" pattern="[^@\s]+(@[^\s]+)?" inputmode="email"
 							autofocus="" autocomplete="email" autocorrect="off" autocapitalize="off" spellcheck="false"
 							data-bind="textInput: email, disable: submitRequest"
 							data-i18n="[placeholder]GLOBAL/EMAIL" />
@@ -41,9 +37,9 @@
 				</div>
 				<div id="plugin-Login-BottomControlGroup"></div>
 				<div class="controls" data-bind="hidden: hideSubmitButton">
-					<button type="submit" class="btn btn-large btn-block buttonLogin" data-bind="command: submitCommand">
-						<span class="i18n-animation" data-i18n="LOGIN/BUTTON_SIGN_IN"></span>
-					</button>
+					<button type="submit" class="btn btn-large btn-block buttonLogin"
+						data-bind="command: submitCommand"
+						data-i18n="LOGIN/BUTTON_SIGN_IN"></button>
 				</div>
 				<div class="controls clearfix" style="margin-bottom: 10px">
 					<div class="pull-right language-buttons">
@@ -57,7 +53,6 @@
 						name: 'CheckboxSimple',
 						params: {
 							label: 'LOGIN/LABEL_SIGN_ME',
-							labelAnimated: true,
 							value: signMe
 						}
 					}"></div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
index b18de2cd0..3842107bb 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
@@ -1,8 +1,6 @@
 <div class="b-settings-general g-ui-user-select-none">
 	<div class="form-horizontal">
-		<div class="legend">
-			<span class="i18n-animation" data-i18n="SETTINGS_GENERAL/LEGEND_GENERAL"></span>
-		</div>
+		<div class="legend" data-i18n="SETTINGS_GENERAL/LEGEND_GENERAL"></div>
 		<div class="control-group">
 			<label class="control-label" data-i18n="SETTINGS_GENERAL/LABEL_IDENTITY"></label>
 			<div class="controls">
@@ -108,9 +106,7 @@
 		</div>
 	</div>
 	<div class="form-horizontal">
-		<div class="legend">
-			<span class="i18n-animation" data-i18n="SETTINGS_GENERAL/LABEL_NOTIFICATIONS"></span>
-		</div>
+		<div class="legend" data-i18n="SETTINGS_GENERAL/LABEL_NOTIFICATIONS"></div>
 		<div class="control-group">
 			<div class="controls">
 				<div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
index 8311b9293..ab9f9cdae 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
@@ -9,7 +9,7 @@
 			</div>
 			<a class="btn button-back" data-bind="click: backToMailBoxClick">
 				<i class="fontastic">⬅</i>
-				<span class="i18n-animation" data-i18n="GLOBAL/BACK"></span>
+				<span data-i18n="GLOBAL/BACK"></span>
 			</a>
 		</div>
 	</div>