diff --git a/background.html b/background.html
index cc72737c9..0d4888b77 100644
--- a/background.html
+++ b/background.html
@@ -148,7 +148,7 @@
               <div class='attachment-previews'></div>
               <div class='flex'>
                 <button class='emoji' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button>
-                <textarea class='send-message' placeholder='{{ send-message }}' rows='1' dir='auto' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></textarea>
+                <textarea maxlength='2000' class='send-message' placeholder='{{ send-message }}' rows='1' dir='auto' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></textarea>
                 <div class='capture-audio hide'>
                     <button class='microphone' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button>
                 </div>
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 9855f9d36..03e487a16 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -1623,7 +1623,10 @@
       }
 
       const input = this.$messageField;
-      const message = window.Signal.Emoji.replaceColons(input.val()).trim();
+      const inputMessage = window.Signal.Emoji.replaceColons(input.val()).trim();
+
+      // Limit the message to 2000 characters
+      const message = inputMessage.substring(0, Math.min(2000, inputMessage.length));
 
       try {
         if (!message.length && !this.fileInput.hasFiles()) {
diff --git a/libtextsecure/task_with_timeout.js b/libtextsecure/task_with_timeout.js
index 119d03f11..e0c96ef9e 100644
--- a/libtextsecure/task_with_timeout.js
+++ b/libtextsecure/task_with_timeout.js
@@ -7,7 +7,7 @@
   window.textsecure = window.textsecure || {};
 
   window.textsecure.createTaskWithTimeout = (task, id, options = {}) => {
-    const timeout = options.timeout || 1000 * 60 * 2; // two minutes
+    const timeout = options.timeout || 1000 * 60 * 3; // three minutes
 
     const errorForStack = new Error('for stack');
     return () =>