diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md
index beded60b13..cc37144450 100644
--- a/ATTRIBUTION.md
+++ b/ATTRIBUTION.md
@@ -30,3 +30,4 @@ FairEmail uses:
 * [Compact Encoding Detection](https://github.com/google/compact_enc_det). Copyright 2016 Google Inc. [Apache License 2.0](https://github.com/google/compact_enc_det/blob/master/LICENSE).
 * [Compact Language Detector v3](https://github.com/google/cld3). Copyright 2016 Google Inc. All rights reserved. [Apache License 2.0](https://github.com/google/cld3/blob/master/LICENSE).
 * [POI-HMEF](https://poi.apache.org/components/hmef/index.html). Copyright © 2001-2020 The Apache Software Foundation. [Apache Software License v2](https://poi.apache.org/devel/guidelines.html#The+Licensing).
+* [GoSquared's Flag Icon Set](https://github.com/gosquared/flags). Copyright (c) 2017 Go Squared Ltd. [MIT License](https://github.com/gosquared/flags/blob/master/LICENSE.txt).
diff --git a/app/src/main/assets/ATTRIBUTION.md b/app/src/main/assets/ATTRIBUTION.md
index beded60b13..cc37144450 100644
--- a/app/src/main/assets/ATTRIBUTION.md
+++ b/app/src/main/assets/ATTRIBUTION.md
@@ -30,3 +30,4 @@ FairEmail uses:
 * [Compact Encoding Detection](https://github.com/google/compact_enc_det). Copyright 2016 Google Inc. [Apache License 2.0](https://github.com/google/compact_enc_det/blob/master/LICENSE).
 * [Compact Language Detector v3](https://github.com/google/cld3). Copyright 2016 Google Inc. All rights reserved. [Apache License 2.0](https://github.com/google/cld3/blob/master/LICENSE).
 * [POI-HMEF](https://poi.apache.org/components/hmef/index.html). Copyright © 2001-2020 The Apache Software Foundation. [Apache Software License v2](https://poi.apache.org/devel/guidelines.html#The+Licensing).
+* [GoSquared's Flag Icon Set](https://github.com/gosquared/flags). Copyright (c) 2017 Go Squared Ltd. [MIT License](https://github.com/gosquared/flags/blob/master/LICENSE.txt).
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 4aa22b33cb..7705f40c3f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1448,11 +1448,18 @@ public class FragmentCompose extends FragmentBase {
             String json = Helper.readStream(is);
             JSONArray jarray = new JSONArray(json);
 
+            String pkg = getContext().getPackageName();
             for (int i = 0; i < jarray.length(); i++) {
                 JSONObject jlanguage = jarray.getJSONObject(i);
+                String name = jlanguage.getString("name");
+                String target = jlanguage.getString("language");
                 SubMenu smenu = menu.findItem(R.id.menu_translate).getSubMenu();
-                smenu.add(R.id.group_translate, i + 1, i + 1, jlanguage.getString("name"))
-                        .setIntent(new Intent().putExtra("target", jlanguage.getString("language")));
+                MenuItem item = smenu.add(R.id.group_translate, i + 1, i + 1, name)
+                        .setIntent(new Intent().putExtra("target", target));
+                String resname = "language_" + target.toLowerCase().replace('-', '_');
+                int resid = getResources().getIdentifier(resname, "drawable", pkg);
+                if (resid > 0)
+                    item.setIcon(resid);
             }
         } catch (Throwable ex) {
             Log.e(ex);
diff --git a/app/src/main/resExtra/drawable/language_de.png b/app/src/main/resExtra/drawable/language_de.png
new file mode 100644
index 0000000000..ebb1843487
Binary files /dev/null and b/app/src/main/resExtra/drawable/language_de.png differ
diff --git a/app/src/main/resExtra/drawable/language_en_gb.png b/app/src/main/resExtra/drawable/language_en_gb.png
new file mode 100644
index 0000000000..fb1edaa081
Binary files /dev/null and b/app/src/main/resExtra/drawable/language_en_gb.png differ
diff --git a/app/src/main/resExtra/drawable/language_en_us.png b/app/src/main/resExtra/drawable/language_en_us.png
new file mode 100644
index 0000000000..b269593a3b
Binary files /dev/null and b/app/src/main/resExtra/drawable/language_en_us.png differ
diff --git a/app/src/main/resExtra/drawable/language_es.png b/app/src/main/resExtra/drawable/language_es.png
new file mode 100644
index 0000000000..cf53a8d652
Binary files /dev/null and b/app/src/main/resExtra/drawable/language_es.png differ
diff --git a/app/src/main/resExtra/drawable/language_fr.png b/app/src/main/resExtra/drawable/language_fr.png
new file mode 100644
index 0000000000..91a645e833
Binary files /dev/null and b/app/src/main/resExtra/drawable/language_fr.png differ
diff --git a/app/src/main/resExtra/drawable/language_it.png b/app/src/main/resExtra/drawable/language_it.png
new file mode 100644
index 0000000000..8e9e7fa697
Binary files /dev/null and b/app/src/main/resExtra/drawable/language_it.png differ