diff --git a/newsfragment/3313.feature b/newsfragment/3313.feature
new file mode 100644
index 0000000000..3d243fa1ef
--- /dev/null
+++ b/newsfragment/3313.feature
@@ -0,0 +1 @@
+Priority conversations for Android 11+
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index 37de7b1a75..ac5f698750 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -17,11 +17,15 @@ package im.vector.app.features.notifications
 
 import android.content.Context
 import android.graphics.Bitmap
+import android.os.Build
 import android.os.Handler
 import android.os.HandlerThread
 import androidx.annotation.WorkerThread
 import androidx.core.app.NotificationCompat
 import androidx.core.app.Person
+import androidx.core.content.pm.ShortcutInfoCompat
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.graphics.drawable.IconCompat
 import im.vector.app.ActiveSessionDataSource
 import im.vector.app.BuildConfig
 import im.vector.app.R
@@ -29,6 +33,7 @@ import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.FirstThrottler
 import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.invite.AutoAcceptInvites
+import im.vector.app.features.home.room.detail.RoomDetailActivity
 import im.vector.app.features.settings.VectorPreferences
 import me.gujun.android.span.span
 import org.matrix.android.sdk.api.session.Session
@@ -331,6 +336,19 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
                             .setKey(event.senderId)
                             .build()
 
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                        val openRoomIntent = RoomDetailActivity.shortcutIntent(context, roomId)
+
+                        val shortcut = ShortcutInfoCompat.Builder(context, roomId)
+                                .setLongLived(true)
+                                .setIntent(openRoomIntent)
+                                .setShortLabel(roomName)
+                                .setIcon(largeBitmap?.let { IconCompat.createWithAdaptiveBitmap(it) } ?: iconLoader.getUserIcon(event.senderAvatarPath))
+                                .build()
+
+                        ShortcutManagerCompat.pushDynamicShortcut(context, shortcut)
+                    }
+
                     if (event.outGoingMessage && event.outGoingMessageFailed) {
                         style.addMessage(stringProvider.getString(R.string.notification_inline_reply_failed), event.timestamp, senderPerson)
                         roomEventGroupInfo.hasSmartReplyError = true