diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java
index 6257f2d452c4113318147db5180a0c974302fd07..2af59d651f66b9dbae193b4ac018fe9b8c066eb6 100644
--- a/src/com/android/inputmethod/latin/LatinIME.java
+++ b/src/com/android/inputmethod/latin/LatinIME.java
@@ -318,12 +318,14 @@ public class LatinIME extends InputMethodService
         Resources orig = getResources();
         Configuration conf = orig.getConfiguration();
         Locale saveLocale = conf.locale;
+        boolean different = !conf.locale.getCountry().equalsIgnoreCase(locale.substring(0, 2));
         conf.locale = new Locale(locale);
         orig.updateConfiguration(conf, orig.getDisplayMetrics());
         if (mSuggest != null) {
             mSuggest.close();
         }
         mSuggest = new Suggest(this, R.raw.main);
+        mSuggest.setAutoTextEnabled(!different);
         if (mUserDictionary != null) mUserDictionary.close();
         mUserDictionary = new UserDictionary(this);
         if (mContactsDictionary == null) {
diff --git a/src/com/android/inputmethod/latin/Suggest.java b/src/com/android/inputmethod/latin/Suggest.java
index 5833c02a52a465742e5317d2a26ef4919bb8e307..e806dc59ba3682a36372ea8e3cfaa658b863c7b5 100755
--- a/src/com/android/inputmethod/latin/Suggest.java
+++ b/src/com/android/inputmethod/latin/Suggest.java
@@ -51,6 +51,8 @@ public class Suggest implements Dictionary.WordCallback {
 
     private int mPrefMaxSuggestions = 12;
 
+    private boolean mAutoTextEnabled;
+
     private int[] mPriorities = new int[mPrefMaxSuggestions];
     // Handle predictive correction for only the first 1280 characters for performance reasons
     // If we support scripts that need latin characters beyond that, we should probably use some
@@ -76,6 +78,10 @@ public class Suggest implements Dictionary.WordCallback {
         }
     }
 
+    public void setAutoTextEnabled(boolean enabled) {
+        mAutoTextEnabled = enabled;
+    }
+
     public int getCorrectionMode() {
         return mCorrectionMode;
     }
@@ -207,29 +213,31 @@ public class Suggest implements Dictionary.WordCallback {
                 mHaveCorrection = false;
             }
         }
-        
-        int i = 0;
-        int max = 6;
-        // Don't autotext the suggestions from the dictionaries
-        if (mCorrectionMode == CORRECTION_BASIC) max = 1;
-        while (i < mSuggestions.size() && i < max) {
-            String suggestedWord = mSuggestions.get(i).toString().toLowerCase();
-            CharSequence autoText =
-                    AutoText.get(suggestedWord, 0, suggestedWord.length(), view);
-            // Is there an AutoText correction?
-            boolean canAdd = autoText != null;
-            // Is that correction already the current prediction (or original word)?
-            canAdd &= !TextUtils.equals(autoText, mSuggestions.get(i));
-            // Is that correction already the next predicted word?
-            if (canAdd && i + 1 < mSuggestions.size() && mCorrectionMode != CORRECTION_BASIC) {
-                canAdd &= !TextUtils.equals(autoText, mSuggestions.get(i + 1));
-            }
-            if (canAdd) {
-                mHaveCorrection = true;
-                mSuggestions.add(i + 1, autoText);
+
+        if (mAutoTextEnabled) {
+            int i = 0;
+            int max = 6;
+            // Don't autotext the suggestions from the dictionaries
+            if (mCorrectionMode == CORRECTION_BASIC) max = 1;
+            while (i < mSuggestions.size() && i < max) {
+                String suggestedWord = mSuggestions.get(i).toString().toLowerCase();
+                CharSequence autoText =
+                        AutoText.get(suggestedWord, 0, suggestedWord.length(), view);
+                // Is there an AutoText correction?
+                boolean canAdd = autoText != null;
+                // Is that correction already the current prediction (or original word)?
+                canAdd &= !TextUtils.equals(autoText, mSuggestions.get(i));
+                // Is that correction already the next predicted word?
+                if (canAdd && i + 1 < mSuggestions.size() && mCorrectionMode != CORRECTION_BASIC) {
+                    canAdd &= !TextUtils.equals(autoText, mSuggestions.get(i + 1));
+                }
+                if (canAdd) {
+                    mHaveCorrection = true;
+                    mSuggestions.add(i + 1, autoText);
+                    i++;
+                }
                 i++;
             }
-            i++;
         }
 
         removeDupes();