diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 45ac37a3c9..0196b6cc73 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3581,9 +3581,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     Locale.getDefault().getLanguage(),
                     new FragmentDialogTranslate.ITranslate() {
                         @Override
-                        public void onTranslated(String text) {
+                        public void onTranslated(String language, String text) {
                             new AlertDialog.Builder(context)
-                                    .setTitle(R.string.title_translate)
+                                    .setTitle(new Locale(language).getDisplayLanguage())
                                     .setMessage(text)
                                     .show();
                         }
diff --git a/app/src/stub/java/eu/faircode/email/FragmentDialogTranslate.java b/app/src/stub/java/eu/faircode/email/FragmentDialogTranslate.java
index c18732ddcb..1606e258f6 100644
--- a/app/src/stub/java/eu/faircode/email/FragmentDialogTranslate.java
+++ b/app/src/stub/java/eu/faircode/email/FragmentDialogTranslate.java
@@ -21,7 +21,7 @@ public class FragmentDialogTranslate extends FragmentDialogBase {
     }
 
     interface ITranslate {
-        void onTranslated(String text);
+        void onTranslated(String language, String text);
 
         void onError(Throwable ex);
     }
diff --git a/app/src/xlat/java/eu/faircode/email/FragmentDialogTranslate.java b/app/src/xlat/java/eu/faircode/email/FragmentDialogTranslate.java
index 3d16e55771..e0a382d62f 100644
--- a/app/src/xlat/java/eu/faircode/email/FragmentDialogTranslate.java
+++ b/app/src/xlat/java/eu/faircode/email/FragmentDialogTranslate.java
@@ -46,7 +46,7 @@ public class FragmentDialogTranslate extends FragmentDialogBase {
 
                         Translate(text, targetLanguage, new ITranslate() {
                             @Override
-                            public void onTranslated(String text) {
+                            public void onTranslated(String language, String text) {
                                 getArguments().putString("translated", text);
                                 sendResult(RESULT_OK);
                             }
@@ -74,13 +74,12 @@ public class FragmentDialogTranslate extends FragmentDialogBase {
                 .addOnSuccessListener(
                         new OnSuccessListener<String>() {
                             @Override
-                            public void onSuccess(@Nullable String sourceLanguage) {
-                                Log.i("Translate source=" + sourceLanguage);
-                                if (sourceLanguage.equals("und"))
-                                    sourceLanguage = TranslateLanguage.ENGLISH;
+                            public void onSuccess(@Nullable String language) {
+                                Log.i("Translate source=" + language);
+                                final String sourceLanguage = (language.equals("und") ? TranslateLanguage.ENGLISH : language);
 
                                 if (sourceLanguage.equals(targetLanguage)) {
-                                    intf.onTranslated(text);
+                                    intf.onTranslated(sourceLanguage, text);
                                     return;
                                 }
 
@@ -102,7 +101,7 @@ public class FragmentDialogTranslate extends FragmentDialogBase {
                                                                         new OnSuccessListener<String>() {
                                                                             @Override
                                                                             public void onSuccess(@NonNull String translatedText) {
-                                                                                intf.onTranslated(translatedText);
+                                                                                intf.onTranslated(sourceLanguage, translatedText);
                                                                             }
                                                                         })
                                                                 .addOnFailureListener(
@@ -133,7 +132,7 @@ public class FragmentDialogTranslate extends FragmentDialogBase {
     }
 
     interface ITranslate {
-        void onTranslated(String text);
+        void onTranslated(String language, String text);
 
         void onError(Throwable ex);
     }