diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index c084080eb6..748f77ba77 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -66,11 +66,6 @@
                            android:title="@string/preferences__complete_key_exchanges"
                            android:summary="@string/preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key" />
 
-    <CheckBoxPreference android:defaultValue="true"
-                        android:key="pref_key_tag_whitespace"
-                        android:summary="@string/preferences__include_a_whitespace_tag_at_the_end_of_every_non_encrypted_message"
-                        android:title="@string/preferences__include_whitespace_tag" />
-
     <CheckBoxPreference android:defaultValue="true"
                         android:key="pref_send_identity_key"
                         android:summary="@string/preferences__sign_key_exchange_messages_with_identity_key"
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index 2b224043d3..e52cad0b44 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -56,7 +56,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
   private static final int   PICK_IDENTITY_CONTACT        = 1;
   private static final int   IMPORT_IDENTITY_ID           = 2;
 
-  public static final String WHITESPACE_PREF                  = "pref_key_tag_whitespace";
   public static final String RINGTONE_PREF                    = "pref_key_ringtone";
   public static final String VIBRATE_PREF                     = "pref_key_vibrate";
   public static final String NOTIFICATION_PREF                = "pref_key_enable_notifications";
diff --git a/src/org/thoughtcrime/securesms/protocol/Tag.java b/src/org/thoughtcrime/securesms/protocol/Tag.java
index 291b6ceb87..bcdb98be33 100644
--- a/src/org/thoughtcrime/securesms/protocol/Tag.java
+++ b/src/org/thoughtcrime/securesms/protocol/Tag.java
@@ -13,8 +13,7 @@ public class Tag {
   public static boolean isTaggable(Context context, String message) {
     SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
 
-    return sp.getBoolean(ApplicationPreferencesActivity.WHITESPACE_PREF, true) &&
-           message.matches(".*[^\\s].*")                                       &&
+    return message.matches(".*[^\\s].*")                                       &&
            message.replaceAll("\\s+$", "").length() + WHITESPACE_TAG.length() <= 158;
   }