diff --git a/ChangeLog b/ChangeLog
index ba270f823..729cbc2bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-07-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreUserContext.m
+	(-initWithUsername:andTDBIndexing:): attempt to read the user
+	password from a property list.
+
+	* OpenChange/samba-get-config.py: new utility taking a samba
+	configuration variable and prints the value on stdout
+
 2012-07-24  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxPreferences.js (savePreferences):
diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile
index 91b75ec0e..afed24ce2 100644
--- a/OpenChange/GNUmakefile
+++ b/OpenChange/GNUmakefile
@@ -26,6 +26,8 @@ BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)
 
 UNRTF_DIR = unrtf-$(UNRTF_VERSION)
 
+SAMBA_PRIVATE_DIR = $(shell ./samba-get-config.py "private dir")
+
 $(SOGOBACKEND)_SUBPROJECTS += $(UNRTF_DIR)/src
 
 $(SOGOBACKEND)_PRINCIPAL_CLASS = MAPIApplication
@@ -190,6 +192,7 @@ $(SOGOBACKEND)_LIB_DIRS += \
 
 ADDITIONAL_INCLUDE_DIRS += \
 	-Werror -Wall \
+	-DSAMBA_PRIVATE_DIR=@"\"$(SAMBA_PRIVATE_DIR)\"" \
 	$(LIBMAPI_CFLAGS) \
 	$(LIBMAPISTORE_CFLAGS) \
 	-I$(UNRTF_DIR)/src \
diff --git a/OpenChange/MAPIStoreUserContext.m b/OpenChange/MAPIStoreUserContext.m
index bf5d97f0c..7e6f7ec5a 100644
--- a/OpenChange/MAPIStoreUserContext.m
+++ b/OpenChange/MAPIStoreUserContext.m
@@ -20,8 +20,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSData.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSMapTable.h>
+#import <Foundation/NSPropertyList.h>
 #import <Foundation/NSThread.h>
 #import <Foundation/NSURL.h>
 
@@ -95,9 +97,37 @@ static NSMapTable *contextsTable = nil;
   return self;
 }
 
+- (NSString *) _readUserPassword: (NSString *) newUsername
+{
+  NSString *password;
+  NSData *content;
+  id plist;
+  NSPropertyListFormat plistFormat;
+  NSString *error;
+
+  password = nil;
+
+  content = [NSData dataWithContentsOfFile: SAMBA_PRIVATE_DIR
+                    @"/mapistore/SOGo/userpwds.plist"];
+  if (content)
+    {
+      plist = [NSPropertyListSerialization
+                propertyListFromData: content
+                    mutabilityOption: NSPropertyListImmutable
+                              format: &plistFormat
+                    errorDescription: &error];
+      if ([plist respondsToSelector: @selector (objectForKey:)])
+        password = [plist objectForKey: newUsername];
+    }
+
+  return password;
+}
+
 - (id) initWithUsername: (NSString *) newUsername
          andTDBIndexing: (struct tdb_wrap *) indexingTdb
 {
+  NSString *userPassword;
+
   if ((self = [self init]))
     {
       /* "username" will be retained by table */
@@ -109,7 +139,10 @@ static NSMapTable *contextsTable = nil;
       authenticator = [MAPIStoreAuthenticator new];
       [authenticator setUsername: username];
       /* TODO: very hackish (IMAP access) */
-      [authenticator setPassword: username];
+      userPassword = [self _readUserPassword: newUsername];
+      if ([userPassword length] == 0)
+        userPassword = username;
+      [authenticator setPassword: userPassword];
     }
 
   return self;
diff --git a/OpenChange/iCalEvent+MAPIStore.m b/OpenChange/iCalEvent+MAPIStore.m
index 82785046a..cacec6ea2 100644
--- a/OpenChange/iCalEvent+MAPIStore.m
+++ b/OpenChange/iCalEvent+MAPIStore.m
@@ -169,8 +169,7 @@
     [self setTimeStampAsDate: value];
  
   /* SUMMARY */
-  value = [properties
-                objectForKey: MAPIPropertyKey (PR_NORMALIZED_SUBJECT_UNICODE)];
+  value = [properties objectForKey: MAPIPropertyKey (PidTagNormalizedSubject)];
   if (value)
     [self setSummary: value];
 
diff --git a/OpenChange/samba-get-config.py b/OpenChange/samba-get-config.py
new file mode 100755
index 000000000..c91c3ed44
--- /dev/null
+++ b/OpenChange/samba-get-config.py
@@ -0,0 +1,8 @@
+#!/usr/bin/python
+
+import sys
+import samba.param
+
+a = samba.param.LoadParm()
+a.load_default()
+print a.get(sys.argv[1])