diff --git a/ChangeLog b/ChangeLog
index fd4344a64..001b3c641 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 	when forwarding a mail with attachments and no
 	Content-Disposition header (or filename) was found. This
 	avoid losing attachments when forwarding mails.
+	* UI/PreferencesUI/UIxPreferences.m
+	We retain/release properly the vacationOptions and
+	forwardOptions ivars.
 
 2009-11-24  Francis Lachapelle  <flachapelle@inverse.ca>
 
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 1cf274af4..f26986909 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -109,7 +109,9 @@ static BOOL forwardEnabled = NO;
 	      vacationOptions = [NSMutableDictionary dictionary];
 	      [userDefaults setObject: vacationOptions forKey: @"Vacation"];
 	    }
+	  [vacationOptions retain];
 	}
+
       if (forwardEnabled)
 	{
 	  forwardOptions = [userDefaults objectForKey: @"Forward"];
@@ -118,6 +120,7 @@ static BOOL forwardEnabled = NO;
 	      forwardOptions = [NSMutableDictionary dictionary];
 	      [userDefaults setObject: forwardOptions forKey: @"Forward"];
 	    }
+	  [forwardOptions retain];
 	}
     }
 
@@ -130,6 +133,8 @@ static BOOL forwardEnabled = NO;
   [item release];
   [user release];
   [userDefaults release];
+  [vacationOptions release];
+  [forwardOptions release];
   [hours release];
   [daysOfWeek release];
   [locale release];