diff --git a/ChangeLog b/ChangeLog
index 09dfa23c2..18e19c7ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-10-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailToSelection.m ([UIxMailToSelection -to]):
+	"to" should be retained, otherwise it will be autoreleased and a
+	crash will occur.
+
 	* UI/Contacts/UIxContactEditor.m ([UIxContactEditor
 	-writeAction]): updated method to fetch the card before initing
 	the snapshot.
diff --git a/UI/MailerUI/UIxMailToSelection.m b/UI/MailerUI/UIxMailToSelection.m
index 251c43be6..d8c17cbbb 100644
--- a/UI/MailerUI/UIxMailToSelection.m
+++ b/UI/MailerUI/UIxMailToSelection.m
@@ -114,7 +114,10 @@ static NSArray *headers = nil;
  
   mailto = [self queryParameterForKey:@"mailto"];
   if ([mailto length] > 0 && ![to count])
-    to = [NSArray arrayWithObject: mailto];
+    {
+      to = [NSArray arrayWithObject: mailto];
+      [to retain];
+    }
 
   return self->to;
 }