diff --git a/core/lib/presentation/utils/html_transformer/transform_configuration.dart b/core/lib/presentation/utils/html_transformer/transform_configuration.dart
index 36cf86077..bcba4149c 100644
--- a/core/lib/presentation/utils/html_transformer/transform_configuration.dart
+++ b/core/lib/presentation/utils/html_transformer/transform_configuration.dart
@@ -54,7 +54,8 @@ class TransformConfiguration {
   factory TransformConfiguration.forEditDraftsEmail() => TransformConfiguration.create(
     customDomTransformers: [
       ...TransformConfiguration.forDraftsEmail().domTransformers,
-      const HideDraftSignatureTransformer()
+      if (PlatformInfo.isWeb)
+        const HideDraftSignatureTransformer()
     ]
   );
 
diff --git a/lib/features/composer/presentation/extensions/setup_selected_identity_extension.dart b/lib/features/composer/presentation/extensions/setup_selected_identity_extension.dart
index 5203ec22c..76b9a7b0c 100644
--- a/lib/features/composer/presentation/extensions/setup_selected_identity_extension.dart
+++ b/lib/features/composer/presentation/extensions/setup_selected_identity_extension.dart
@@ -9,8 +9,8 @@ extension SetupSelectedIdentityExtension on ComposerController {
 
   Future<void> setupSelectedIdentity() async {
     if (identitySelected.value != null) {
-      if (PlatformInfo.isMobile && currentEmailActionType == EmailActionType.editDraft) {
-        await selectIdentity(identitySelected.value);
+      if (PlatformInfo.isMobile &&
+          currentEmailActionType == EmailActionType.editDraft) {
         onCompleteSetupComposer();
       }
       return;