From d63fd6c3a25e7909a7e0aecc912dd91f551ff95e Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 10 Feb 2022 15:56:19 -0500
Subject: [PATCH] fix(mail): don't add signature unless a default identity is
 forced

---
 SoObjects/Mailer/SOGoMailForward.m | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m
index 57b0b75d2..120a925fd 100644
--- a/SoObjects/Mailer/SOGoMailForward.m
+++ b/SoObjects/Mailer/SOGoMailForward.m
@@ -265,12 +265,12 @@
               identity = [[sourceMail mailAccountFolder] identityForEmail: email];
             }
         }
-    }
 
-  if (!identity)
-    {
-      identity = [[context activeUser] defaultIdentity];
+      if (!identity)
+        identity = [[sourceMail mailAccountFolder] defaultIdentity];
     }
+  else
+    identity = [[context activeUser] defaultIdentity];
 
   if (identity)
     {