diff --git a/app/src/debug/res/font/montserrat.xml b/app/src/debug/res/font/montserrat.xml
new file mode 100644
index 0000000000..dd674a2db4
--- /dev/null
+++ b/app/src/debug/res/font/montserrat.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+    <font
+        app:font="@font/montserrat_regular"
+        app:fontStyle="normal"
+        app:fontWeight="400" />
+    <font
+        app:font="@font/montserrat_italic"
+        app:fontStyle="italic"
+        app:fontWeight="400" />
+    <font
+        app:font="@font/montserrat_bold"
+        app:fontStyle="normal"
+        app:fontWeight="700" />
+    <font
+        app:font="@font/montserrat_bold_italic"
+        app:fontStyle="italic"
+        app:fontWeight="700" />
+</font-family>
\ No newline at end of file
diff --git a/app/src/debug/res/font/montserrat_bold.ttf b/app/src/debug/res/font/montserrat_bold.ttf
new file mode 100644
index 0000000000..55e0b1a553
Binary files /dev/null and b/app/src/debug/res/font/montserrat_bold.ttf differ
diff --git a/app/src/debug/res/font/montserrat_bold_italic.ttf b/app/src/debug/res/font/montserrat_bold_italic.ttf
new file mode 100644
index 0000000000..6b4541de7b
Binary files /dev/null and b/app/src/debug/res/font/montserrat_bold_italic.ttf differ
diff --git a/app/src/debug/res/font/montserrat_italic.ttf b/app/src/debug/res/font/montserrat_italic.ttf
new file mode 100644
index 0000000000..be99e1c22c
Binary files /dev/null and b/app/src/debug/res/font/montserrat_italic.ttf differ
diff --git a/app/src/debug/res/font/montserrat_regular.ttf b/app/src/debug/res/font/montserrat_regular.ttf
new file mode 100644
index 0000000000..1cd025961b
Binary files /dev/null and b/app/src/debug/res/font/montserrat_regular.ttf differ
diff --git a/app/src/main/java/eu/faircode/email/StyleHelper.java b/app/src/main/java/eu/faircode/email/StyleHelper.java
index 6b2f6e94f9..1831312381 100644
--- a/app/src/main/java/eu/faircode/email/StyleHelper.java
+++ b/app/src/main/java/eu/faircode/email/StyleHelper.java
@@ -933,6 +933,8 @@ public class StyleHelper {
         String faces = family.toLowerCase(Locale.ROOT);
         if (faces.contains("open sans"))
             return "Open Sans, Arial, Verdana, Helvetica, Helvetica Neue, sans-serif";
+        if (faces.contains("montserrat"))
+            return "Montserrat, sans-serif";
         if (faces.contains("arimo"))
             return "Arimo, Arial, Verdana, Helvetica, Helvetica Neue, sans-serif";
         if (faces.contains("tinos"))
@@ -975,6 +977,9 @@ public class StyleHelper {
             if (faces.contains("open sans"))
                 return ResourcesCompat.getFont(context, R.font.opensans);
 
+            if (faces.contains("montserrat"))
+                return ResourcesCompat.getFont(context, R.font.montserrat);
+
             if (faces.contains("arimo") ||
                     faces.contains("arial") ||
                     faces.contains("verdana") ||
@@ -1038,8 +1043,11 @@ public class StyleHelper {
             result.add(new FontDescriptor("cousine", "Cousine (Courier New)", true));
             result.add(new FontDescriptor("lato", "Lato (Calibri)", true));
             result.add(new FontDescriptor("caladea", "Caladea (Cambria)", true));
-            if (BuildConfig.DEBUG)
+
+            if (BuildConfig.DEBUG) {
                 result.add(new FontDescriptor("open sans", "Open Sans", true));
+                result.add(new FontDescriptor("montserrat", "Montserrat", true));
+            }
 
             result.add(new FontDescriptor("comic sans", "OpenDyslexic", true));
         }
diff --git a/app/src/main/res/font/montserrat.xml b/app/src/main/res/font/montserrat.xml
new file mode 100644
index 0000000000..cf0d10f056
--- /dev/null
+++ b/app/src/main/res/font/montserrat.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+    <font
+        app:font="@font/arimo_regular"
+        app:fontStyle="normal"
+        app:fontWeight="400" />
+    <font
+        app:font="@font/arimo_italic"
+        app:fontStyle="italic"
+        app:fontWeight="400" />
+    <font
+        app:font="@font/arimo_bold"
+        app:fontStyle="normal"
+        app:fontWeight="700" />
+    <font
+        app:font="@font/arimo_bolditalic"
+        app:fontStyle="italic"
+        app:fontWeight="700" />
+</font-family>
\ No newline at end of file