diff --git a/package.json b/package.json
index c8c1d89..35c72ff 100644
--- a/package.json
+++ b/package.json
@@ -1,64 +1,64 @@
 {
-  "name": "whiteout-mail",
-  "version": "0.0.1",
-  "description": "Mail App with integrated OpenPGP encryption.",
-  "author": "Whiteout Networks",
-  "homepage": "https://whiteout.io",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/whiteout-io/mail-html5.git"
-  },
-  "keywords": [
-    "email",
-    "mail",
-    "client",
-    "app",
-    "openpgp",
-    "pgp",
-    "gpg",
-    "imap",
-    "smtp"
-  ],
-  "engines": {
-    "node": ">=0.10"
-  },
-  "scripts": {
-    "postinstall": "grunt",
-    "test": "grunt && grunt test",
-    "start": "node server.js"
-  },
-  "dependencies": {
-    "axe-logger": "~0.0.2",
-    "compression": "^1.0.11",
-    "crypto-lib": "~0.2.1",
-    "dompurify": "~0.4.2",
-    "express": "^4.8.3",
-    "imap-client": "~0.4.0",
-    "jquery": "~2.1.1",
-    "mailreader": "~0.3.5",
-    "ng-infinite-scroll": "~1.1.2",
-    "pgpbuilder": "~0.4.0",
-    "pgpmailer": "~0.4.0",
-    "requirejs": "~2.1.14"
-  },
-  "devDependencies": {
-    "angularjs": "https://github.com/whiteout-io/angular.js/tarball/npm-version",
-    "browsercrow": "https://github.com/whiteout-io/browsercrow/tarball/master",
-    "browsersmtp": "https://github.com/whiteout-io/browsersmtp/tarball/master",
-    "grunt": "~0.4.1",
-    "mocha": "~1.13.0",
-    "chai": "~1.7.2",
-    "sinon": "~1.7.3",
-    "grunt-contrib-connect": "~0.5.0",
-    "grunt-contrib-jshint": "~0.6.4",
-    "grunt-mocha": "~0.4.1",
-    "grunt-contrib-clean": "~0.5.0",
-    "grunt-csso": "~0.6.1",
-    "grunt-contrib-sass": "~0.7.3",
-    "grunt-autoprefixer": "~0.7.2",
-    "grunt-contrib-watch": "~0.5.3",
-    "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-compress": "~0.5.2",
-    "grunt-node-webkit-builder": "~0.1.17"
-  }
-}
+    "name": "whiteout-mail",
+    "version": "0.0.1",
+    "description": "Mail App with integrated OpenPGP encryption.",
+    "author": "Whiteout Networks",
+    "homepage": "https://whiteout.io",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/whiteout-io/mail-html5.git"
+    },
+    "keywords": [
+        "email",
+        "mail",
+        "client",
+        "app",
+        "openpgp",
+        "pgp",
+        "gpg",
+        "imap",
+        "smtp"
+    ],
+    "engines": {
+        "node": ">=0.10"
+    },
+    "scripts": {
+        "postinstall": "grunt",
+        "test": "grunt && grunt test",
+        "start": "node server.js"
+    },
+    "dependencies": {
+        "axe-logger": "~0.0.2",
+        "compression": "^1.0.11",
+        "crypto-lib": "~0.2.1",
+        "dompurify": "~0.4.2",
+        "express": "^4.8.3",
+        "imap-client": "~0.4.0",
+        "jquery": "~2.1.1",
+        "mailreader": "~0.3.5",
+        "ng-infinite-scroll": "~1.1.2",
+        "pgpbuilder": "~0.4.0",
+        "pgpmailer": "~0.4.0",
+        "requirejs": "~2.1.14"
+    },
+    "devDependencies": {
+        "angularjs": "https://github.com/whiteout-io/angular.js/tarball/npm-version",
+        "browsercrow": "https://github.com/whiteout-io/browsercrow/tarball/master",
+        "browsersmtp": "https://github.com/whiteout-io/browsersmtp/tarball/master",
+        "grunt": "~0.4.1",
+        "mocha": "~1.13.0",
+        "chai": "~1.7.2",
+        "sinon": "~1.7.3",
+        "grunt-contrib-connect": "~0.5.0",
+        "grunt-contrib-jshint": "~0.6.4",
+        "grunt-mocha": "~0.4.1",
+        "grunt-contrib-clean": "~0.5.0",
+        "grunt-csso": "~0.6.1",
+        "grunt-contrib-sass": "~0.7.3",
+        "grunt-autoprefixer": "~0.7.2",
+        "grunt-contrib-watch": "~0.5.3",
+        "grunt-contrib-copy": "~0.4.1",
+        "grunt-contrib-compress": "~0.5.2",
+        "grunt-node-webkit-builder": "~0.1.17"
+    }
+}
\ No newline at end of file
diff --git a/src/sass/components/_tags-input.scss b/src/sass/components/_tags-input.scss
index 6006758..8613722 100644
--- a/src/sass/components/_tags-input.scss
+++ b/src/sass/components/_tags-input.scss
@@ -45,6 +45,10 @@
         }
     }
 
+    li.ng-animate {
+        transition: none;
+    }
+
     .autocomplete {
         margin-top: 5px;
         position: absolute;
diff --git a/src/sass/views/_write.scss b/src/sass/views/_write.scss
index 58dbb3c..14fbb94 100644
--- a/src/sass/views/_write.scss
+++ b/src/sass/views/_write.scss
@@ -54,6 +54,10 @@
                     color: $color-blue;
                     text-decoration: underline;
                 }
+
+                &.ng-animate {
+                    transition: none;
+                }
             }
         }
     }
diff --git a/src/tpl/write.html b/src/tpl/write.html
index 747870e..2baa4a9 100644
--- a/src/tpl/write.html
+++ b/src/tpl/write.html
@@ -14,7 +14,7 @@
          focus-input-on-click>
         <label>To:</label>
         <tags-input class="tags-input" ng-model="to" type="email" tabindex="1" add-on-space="true" add-on-enter="true" enable-editing-last-tag="true"
-          tag-style="tagStyle" display-property="address" on-tag-added="verify($tag)"
+          tag-style="tagStyle" display-property="address" on-tag-added="verify($tag)" on-tag-removed="checkSendStatus()"
           allowed-tags-pattern='^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$'
           placeholder="add recipient">
           <auto-complete source="lookupAddressBook($query)" min-length="1"></auto-complete>
@@ -25,7 +25,7 @@
          focus-input-on-click>
         <label>Cc:</label>
         <tags-input class="tags-input" ng-model="cc" type="email" tabindex="1" add-on-space="true" add-on-enter="true" enable-editing-last-tag="true"
-          tag-style="tagStyle" display-property="address" on-tag-added="verify($tag)"
+          tag-style="tagStyle" display-property="address" on-tag-added="verify($tag)" on-tag-removed="checkSendStatus()"
           allowed-tags-pattern='^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$'
           placeholder="add cc">
           <auto-complete source="lookupAddressBook($query)" min-length="1"></auto-complete>
@@ -36,7 +36,7 @@
          focus-input-on-click>
         <label>Bcc:</label>
         <tags-input class="tags-input" ng-model="bcc" type="email" tabindex="1" add-on-space="true" add-on-enter="true" enable-editing-last-tag="true"
-          tag-style="tagStyle" display-property="address" on-tag-added="verify($tag)"
+          tag-style="tagStyle" display-property="address" on-tag-added="verify($tag)" on-tag-removed="checkSendStatus()"
           allowed-tags-pattern='^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$'
           placeholder="add bcc">
           <auto-complete source="lookupAddressBook($query)" min-length="1"></auto-complete>