diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 8bc8b4465..6fda1fc26 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -787,11 +787,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					.exec(accountID);
 		}
 
-		List<String> recentLanguages = new ArrayList<>(GlobalUserPreferences.recentLanguages);
-		recentLanguages.remove(language);
-		recentLanguages.add(0, language);
-		GlobalUserPreferences.recentLanguages = recentLanguages.stream().limit(4).collect(Collectors.toList());
-		GlobalUserPreferences.save();
+		if (replyTo == null) {
+			List<String> recentLanguages = new ArrayList<>(GlobalUserPreferences.recentLanguages);
+			recentLanguages.remove(language);
+			recentLanguages.add(0, language);
+			GlobalUserPreferences.recentLanguages = recentLanguages.stream().limit(4).collect(Collectors.toList());
+			GlobalUserPreferences.save();
+		}
 	}
 
 	private boolean hasDraft(){