diff --git a/src/cheogram/res/menu/conversations.xml b/src/cheogram/res/menu/conversations.xml
index 9b0093a7c6b13458ef7e16c18363ef26419e390a..c898bc70f187c6ae63fcf024c27e4b60bfee416d 100644
--- a/src/cheogram/res/menu/conversations.xml
+++ b/src/cheogram/res/menu/conversations.xml
@@ -31,6 +31,11 @@
         android:orderInCategory="40"
         android:title="@string/action_muc_details"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/action_block_avatar"
+        android:orderInCategory="50"
+        android:title="Block Avatar"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_archive"
         android:orderInCategory="60"
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 892a6dbeb3bc033b4fd28c72f2b3c8087c0d2f8e..fdd6e18815ef4810e41a12ced8a1820aa6130f83 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1975,10 +1975,7 @@ public class ConversationFragment extends XmppFragment
                 break;
             case R.id.action_block:
             case R.id.action_unblock:
-                final Activity activity = getActivity();
-                if (activity instanceof XmppActivity) {
-                    BlockContactDialog.show((XmppActivity) activity, conversation);
-                }
+                BlockContactDialog.show(activity, conversation);
                 break;
             case R.id.action_audio_call:
                 checkPermissionAndTriggerAudioCall();
@@ -1995,6 +1992,18 @@ public class ConversationFragment extends XmppFragment
             case R.id.action_add_shortcut:
                 addShortcut();
                 break;
+            case R.id.action_block_avatar:
+                new AlertDialog.Builder(activity)
+                    .setTitle(R.string.block_media)
+                    .setMessage("Do you really want to block this avatar?")
+                    .setPositiveButton(R.string.yes, (dialog, whichButton) -> {
+                            activity.xmppConnectionService.blockMedia(activity.xmppConnectionService.getFileBackend().getAvatarFile(conversation.getContact().getAvatarFilename()));
+                            activity.xmppConnectionService.getFileBackend().getAvatarFile(conversation.getContact().getAvatarFilename()).delete();
+                            activity.avatarService().clear(conversation);
+                            conversation.getContact().setAvatar(null);
+                            activity.xmppConnectionService.updateConversationUi();
+                    })
+                    .setNegativeButton(R.string.no, null).show();
             case R.id.action_refresh_feature_discovery:
                 refreshFeatureDiscovery();
                 break;