diff --git a/SOPE/GDLContentStore/GCSFolderType.m b/SOPE/GDLContentStore/GCSFolderType.m
index bb99051e6..e26c988dd 100644
--- a/SOPE/GDLContentStore/GCSFolderType.m
+++ b/SOPE/GDLContentStore/GCSFolderType.m
@@ -20,6 +20,7 @@
 */
 
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSKeyValueCoding.h>
 #import <Foundation/NSSet.h>
 #import <Foundation/NSString.h>
 
@@ -147,7 +148,7 @@
   if ([keys count] == 0)
     return folderQualifier;
 
-  bindings = [_folder valuesForKeys:keys];
+  bindings = [_folder dictionaryWithValuesForKeys:keys];
   return [folderQualifier qualifierWithBindings:bindings
 			  requiresAllVariables:NO];
 }
diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index 5c0a7a661..80c29f512 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -436,7 +436,7 @@ static NSArray *infoKeys = nil;
 - (NSDictionary *) storeInfo
 {
   [self debugWithFormat:@"storing info ..."];
-  return [self valuesForKeys: infoKeys];
+  return [self dictionaryWithValuesForKeys: infoKeys];
 }
 
 /* contacts search */