diff --git a/UI/MailerUI/UIxMailView.m b/UI/MailerUI/UIxMailView.m
index 5c7e25aea..f9aa93cb6 100644
--- a/UI/MailerUI/UIxMailView.m
+++ b/UI/MailerUI/UIxMailView.m
@@ -208,10 +208,11 @@ static NSString *mailETag = nil;
   int count, max;
   BOOL rc;
 
+  rc = NO;
+
   account = [[self clientObject] mailAccountFolder];
   identities = [account identities];
   max = [identities count];
-  rc = NO;
   for (count = 0; !rc && count < max; count++)
     {
       identityEmail = [[identities objectAtIndex: count]