diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
index cb8bf29b5..17ec069fa 100644
--- a/lib/features/composer/presentation/composer_controller.dart
+++ b/lib/features/composer/presentation/composer_controller.dart
@@ -291,6 +291,14 @@ class ComposerController extends BaseController {
     }
   }
 
+  @override
+  void handleExceptionAction({Failure? failure, Exception? exception}) {
+    super.handleExceptionAction(failure: failure, exception: exception);
+    if (failure is GetAllIdentitiesFailure) {
+      _handleGetAllIdentitiesFailure(failure);
+    }
+  }
+
   void _listenStreamEvent() {
     uploadInlineImageWorker = ever(uploadController.uploadInlineViewState, (state) {
       log('ComposerController::_listenStreamEvent()::uploadInlineImageWorker: $state');
@@ -2089,4 +2097,15 @@ class ComposerController extends BaseController {
     log('ComposerController::addAttachmentFromDropZone: $attachment');
     uploadController.initializeUploadAttachments([attachment]);
   }
+
+  void _handleGetAllIdentitiesFailure(GetAllIdentitiesFailure failure) async {
+    log('ComposerController::_handleGetAllIdentitiesFailure:failure: $failure');
+    if (composerArguments.value?.emailActionType == EmailActionType.editSendingEmail && PlatformInfo.isMobile) {
+      final signatureContent = await htmlEditorApi?.getSignatureContent();
+      log('ComposerController::_handleGetAllIdentitiesFailure:signatureContent: $signatureContent');
+      if (signatureContent?.isNotEmpty == true) {
+        await _applySignature(signatureContent!);
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index 67e821445..c6ec89794 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -381,7 +381,7 @@ packages:
     description:
       path: "."
       ref: email_supported
-      resolved-ref: "56d820aa845c98a3a809161c02fe8fff033dd2ae"
+      resolved-ref: c2247abea5baa644fc60c123df7bb7d6a81ed81f
       url: "https://github.com/linagora/enough_html_editor.git"
     source: git
     version: "0.0.5"