diff --git a/FAQ.md b/FAQ.md
index b801611774..ae91404a7b 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1297,6 +1297,9 @@ There are shortcuts available to compose a new message to a favorite contact.
 Shortcuts require Android 7.1 Nougat or later.
 The usage of shortcuts is explained [here](https://support.google.com/android/answer/2781850).
 
+It is also possible to create shortcuts to folders
+by long pressing a folder in the folder list of an account and selecting *Add shortcut*.
+
 <br />
 
 <a name="faq32"></a>
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 48bd450536..ab0265e940 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -28,8 +28,11 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -56,6 +59,9 @@ import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.constraintlayout.widget.Group;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.drawable.IconCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
@@ -568,6 +574,9 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                 popupMenu.getMenu().add(Menu.NONE, R.string.title_create_sub_folder, order++, R.string.title_create_sub_folder)
                         .setEnabled(folder.inferiors);
 
+            if (ShortcutManagerCompat.isRequestPinShortcutSupported(context))
+                popupMenu.getMenu().add(Menu.NONE, R.string.title_pin, order++, R.string.title_pin);
+
             if (!folder.selectable && debug)
                 popupMenu.getMenu().add(Menu.NONE, R.string.title_delete, order++, R.string.title_delete)
                         .setEnabled(folder.inferiors);
@@ -654,6 +663,10 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                             onActionCreateFolder();
                             return true;
 
+                        case R.string.title_pin:
+                            onActionPinFolder();
+                            return true;
+
                         case R.string.title_delete:
                             onActionDeleteFolder();
                             return true;
@@ -879,6 +892,36 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                                     .putExtra("parent", folder.name));
                 }
 
+                private void onActionPinFolder() {
+                    Intent view = new Intent(context, ActivityView.class);
+                    view.setAction("folder:" + folder.id);
+                    view.putExtra("account", folder.account);
+                    view.putExtra("type", folder.type);
+                    view.putExtra("refresh", true);
+                    view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+                    int resid = EntityFolder.getIcon(folder.type);
+                    Drawable d = context.getDrawable(resid);
+                    Bitmap bm = Bitmap.createBitmap(
+                            d.getIntrinsicWidth(),
+                            d.getIntrinsicHeight(),
+                            Bitmap.Config.ARGB_8888);
+                    Canvas canvas = new Canvas(bm);
+                    d.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+                    d.setTint(folder.color == null ? Color.DKGRAY : folder.color);
+                    d.draw(canvas);
+
+                    IconCompat icon = IconCompat.createWithBitmap(bm);
+                    String id = "folder:" + folder.id;
+                    ShortcutInfoCompat.Builder builder = new ShortcutInfoCompat.Builder(context, id)
+                            .setIcon(icon)
+                            .setShortLabel(folder.getDisplayName(context))
+                            .setLongLabel(folder.getDisplayName(context))
+                            .setIntent(view);
+
+                    ShortcutManagerCompat.requestPinShortcut(context, builder.build(), null);
+                }
+
                 private void onActionDeleteFolder() {
                     Bundle aargs = new Bundle();
                     aargs.putLong("id", folder.id);