diff --git a/res/values/styles.xml b/res/values/styles.xml
index dc23a3887b..75d8382c9e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -173,9 +173,7 @@
         <item name="android:padding">2dp</item>
         <item name="android:background">@null</item>
         <item name="android:maxLines">4</item>
-        <!-- TODO: Switch to 64kb to enable long message sending. -->
-        <!--<item name="android:maxLength">65536</item>-->
-        <item name="android:maxLength">2000</item>
+        <item name="android:maxLength">65536</item>
         <item name="android:textColor">?conversation_item_sent_text_primary_color</item>
         <item name="android:capitalize">sentences</item>
         <item name="android:autoText">true</item>
diff --git a/src/org/thoughtcrime/securesms/util/PushCharacterCalculator.java b/src/org/thoughtcrime/securesms/util/PushCharacterCalculator.java
index 452f3851ef..93561487c6 100644
--- a/src/org/thoughtcrime/securesms/util/PushCharacterCalculator.java
+++ b/src/org/thoughtcrime/securesms/util/PushCharacterCalculator.java
@@ -17,9 +17,7 @@
 package org.thoughtcrime.securesms.util;
 
 public class PushCharacterCalculator extends CharacterCalculator {
-  // TODO: Switch to 64kb to enable long message sending.
-//  private static final int MAX_TOTAL_SIZE   = 64 * 1024;
-  private static final int MAX_TOTAL_SIZE   = 2000;
+  private static final int MAX_TOTAL_SIZE   = 64 * 1024;
   private static final int MAX_PRIMARY_SIZE = 2000;
   @Override
   public CharacterState calculateCharacters(String messageBody) {