diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index bd132760a..5b87d8244 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -15,10 +15,12 @@ var Whisper = Whisper || {};
     },
 
     sendMessage: function(e) {
-      if (!this.$input.val().length) { return false; }
-      this.model.sendMessage(this.$input.val());
-      this.$input.val("");
       e.preventDefault();
+      var input = $('#new-message-text');
+      if (input.val().length > 0) {
+        this.model.sendMessage(input.val());
+        input.val("");
+      }
     },
 
     render: function() {
diff --git a/popup.html b/popup.html
index f45ea413b..950fca263 100644
--- a/popup.html
+++ b/popup.html
@@ -39,7 +39,7 @@
 				</div>
 				<div class='message-container'></div>
 				<form id="new-message" class='clearfix'>
-					<input id="send_numbers" type='text' placeholder="+xxxxxxxxxx">
+					<input id="new-message-text" type='text' autocomplete=false>
 					<input type=submit id="compose-message" class='btn btn-square' value='>'>
 				</form>
 			</div>