diff --git a/ChangeLog b/ChangeLog
index 1c975a692..61653a6cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-23  Ludovic Marcotte <lmarcotte@inverse.ca>
+
+        * SoObjects/SOGo/SOGoUser.m:
+	Don't retain/release the language ivar.
+
+
 2009-03-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUser.m ([SOGoUser -language]): cache the
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index c1bbc03e9..3d4a4a9aa 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -464,9 +464,9 @@ _timeValue (NSString *key)
 	  
 	  if (values)
 	    {
-	      /* see explanation in -language */
-	      [language release];
+	      // See explanation in -language
 	      language = nil;
+
 	      // Required parameters for the Web interface. This will trigger the
 	      // preferences to load so it's important to leave those calls here.
 	      if (![[defaults stringForKey: @"ReplyPlacement"] length])
@@ -521,9 +521,9 @@ _timeValue (NSString *key)
 	  values = [settings values];
 	  if (values)
 	    {
-	      /* see explanation in -language */
-	      [language release];
+	      // See explanation in -language
 	      language = nil;
+
 	      // We propagate the loaded user settings to other sogod instances
 	      // which will cache them in SOGoCache (including for the instance
 	      // that actually posts the notification)
@@ -553,12 +553,11 @@ _timeValue (NSString *key)
   if (![language length])
     {
       language = [[self userDefaults] stringForKey: @"Language"];
+      // This is a hack until we handle the connection errors to the db a
+      // better way. It enables us to avoid retrieving the userDefaults too
+      // many times when the DB is down, causing a huge delay.
       if (![language length])
         language = [SOGoUser language];
-      /* This is a hack until we handle the connection errors to the db a
-	 better way. It enables us to avoid retrieving the userDefaults 5000
-	 times when the DB is down, causing a huge delay. */
-      [language retain];
     }
 
   return language;
diff --git a/UI/MailPartViewers/UIxMailPartViewer.m b/UI/MailPartViewers/UIxMailPartViewer.m
index 1767a59c9..a7a8953fc 100644
--- a/UI/MailPartViewers/UIxMailPartViewer.m
+++ b/UI/MailPartViewers/UIxMailPartViewer.m
@@ -113,7 +113,7 @@
   return flatContent;
 }
 
-#warning we should use NSData+Mail's bodyDataFromEncoding: instead
+#warning we should use NSData+Mail bodyDataFromEncoding: instead
 - (NSData *) decodedFlatContent
 {
   NSString *enc;