diff --git a/ChangeLog b/ChangeLog
index c48cb167c..c38b4af30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMessage.m (-getProperty:withTag:):
+	handles PR_HASATTACH, previously found in MAPIStoreMailMessage.
+
 	* OpenChange/MAPIStoreAttachment.m (-nameInContainer): overriden
 	method to return "aid" in the form of a NSString.
 	(-mimeAttachTag): new helper method derived from old code in
diff --git a/OpenChange/MAPIStoreMailMessage.m b/OpenChange/MAPIStoreMailMessage.m
index 68e624b34..67fb9ea23 100644
--- a/OpenChange/MAPIStoreMailMessage.m
+++ b/OpenChange/MAPIStoreMailMessage.m
@@ -231,12 +231,6 @@ static Class NSExceptionK;
       }
       break;
 
-    case PR_HASATTACH:
-      *data = MAPIBoolValue (memCtx,
-                             [[self childKeysMatchingQualifier: nil
-                                    andSortOrderings: nil] count] > 0);
-      break;
-
     case PR_SENSITIVITY: // TODO
     case PR_ORIGINAL_SENSITIVITY: // TODO
       *data = MAPILongValue (memCtx, 0);
diff --git a/OpenChange/MAPIStoreMessage.m b/OpenChange/MAPIStoreMessage.m
index 57e7a3950..05953a4a5 100644
--- a/OpenChange/MAPIStoreMessage.m
+++ b/OpenChange/MAPIStoreMessage.m
@@ -254,6 +254,12 @@
       rc = [self getProperty: data withTag: PR_MESSAGE_CLASS_UNICODE];
       break;
 
+    case PR_HASATTACH:
+      *data = MAPIBoolValue (memCtx,
+                             [[self childKeysMatchingQualifier: nil
+                                    andSortOrderings: nil] count] > 0);
+      break;
+
     default:
       rc = [super getProperty: data withTag: propTag];
     }