diff --git a/OpenChange/MAPIStoreMailVolatileMessage.m b/OpenChange/MAPIStoreMailVolatileMessage.m
index b72bfc27f..9193794dd 100644
--- a/OpenChange/MAPIStoreMailVolatileMessage.m
+++ b/OpenChange/MAPIStoreMailVolatileMessage.m
@@ -569,7 +569,7 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,
 	}
 
       list = MakeRecipientsList ([recipients objectForKey: @"orig"]);
-      if (list)
+      if ([list count])
         [headers setObjects: list forKey: @"from"];
     }
   else