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)
     {