diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 4d119f7ae..7e743227d 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -78,30 +78,6 @@
                 <data android:mimeType="text/*" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEND_MULTIPLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="video/*" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEND_MULTIPLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="video/*" />
-            </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
index 8ed678d22..803b47a97 100644
--- a/lib/features/composer/presentation/composer_controller.dart
+++ b/lib/features/composer/presentation/composer_controller.dart
@@ -1013,7 +1013,21 @@ class ComposerController extends BaseController {
       }
       if (listFileAttachmentSharedMediaFile.isNotEmpty) {
         final listFile = covertListSharedMediaFileToFileInfo(arguments.listSharedMediaFile!);
-        _uploadAttachmentsAction(listFile);
+        if (uploadController.hasEnoughMaxAttachmentSize(listFiles: listFile)) {
+          _uploadAttachmentsAction(listFile);
+        } else {
+          if (currentContext != null) {
+            showConfirmDialogAction(
+              currentContext!,
+              AppLocalizations.of(currentContext!).message_dialog_upload_attachments_exceeds_maximum_size(
+                  filesize(mailboxDashBoardController.maxSizeAttachmentsPerEmail?.value ?? 0, 0)),
+              AppLocalizations.of(currentContext!).got_it,
+                  () => {},
+              title: AppLocalizations.of(currentContext!).maximum_files_size,
+              hasCancelButton: false,
+            );
+          }
+        }
       }
     }