diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 521ee2fc98..70beaade8b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,11 +39,16 @@
             android:excludeFromRecents="true"
             android:launchMode="singleInstance"
             android:theme="@style/Theme.Transparent">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity>
 
         <activity
@@ -57,6 +62,7 @@
             android:exported="true"
             android:launchMode="singleTop"
             android:parentActivityName=".ActivityMain">
+
             <intent-filter>
                 <action android:name="android.intent.action.PROCESS_TEXT" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -69,6 +75,7 @@
             android:exported="true"
             android:launchMode="standard"
             android:parentActivityName=".ActivityView">
+
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <action android:name="android.intent.action.SEND_MULTIPLE" />
@@ -76,11 +83,13 @@
                 <data android:mimeType="*/*" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.SENDTO" />
                 <data android:scheme="mailto" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <data android:scheme="mailto" />
@@ -102,6 +111,7 @@
             android:authorities="${applicationId}"
             android:exported="false"
             android:grantUriPermissions="true">
+
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/fileprovider_paths" />
@@ -110,9 +120,11 @@
         <receiver
             android:name=".Widget"
             android:label="@string/app_name">
+
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
+
             <meta-data
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget" />
@@ -122,6 +134,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 96b8f7db80..aa1d1b7f12 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,6 +7,8 @@
     <string name="channel_notification">Notifications</string>
     <string name="channel_error">Errors</string>
 
+    <string name="shortcut_compose">Compose</string>
+
     <plurals name="title_notification_synchronizing">
         <item quantity="one">Synchronizing %1$d account</item>
         <item quantity="other">Synchronizing %1$d accounts</item>
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
new file mode 100644
index 0000000000..a2bff73ccd
--- /dev/null
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -0,0 +1,13 @@
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:enabled="true"
+        android:icon="@drawable/baseline_edit_24"
+        android:shortcutId="compose"
+        android:shortcutShortLabel="@string/shortcut_compose">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="eu.faircode.email.ActivityCompose"
+            android:targetPackage="eu.faircode.email" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>
\ No newline at end of file