diff --git a/ChangeLog b/ChangeLog
index ba30454ba..50baf93d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-09-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailEditor.m ([UIxMailEditor -from]): retain the
+	initialized value of from, otherwise we create a future zombie.
+
 	* SoObjects/SOGo/SOGoObject.m ([SOGoObject
 	-initWithName:_nameinContainer:_container]): we no longer retain
 	the context, to avoid making a circular reference.
diff --git a/UI/MailerUI/UIxMailView.m b/UI/MailerUI/UIxMailView.m
index eaf7bb234..ae248ce1f 100644
--- a/UI/MailerUI/UIxMailView.m
+++ b/UI/MailerUI/UIxMailView.m
@@ -211,7 +211,6 @@ static NSString *mailETag = nil;
 		inContext: (WOContext *) _ctx
 {
   UIxMailRenderingContext *mctx;
-  NGImap4Connection *conn;
 
   if (mailETag != nil)
     [[_ctx response] setHeader:mailETag forKey:@"etag"];
@@ -225,9 +224,6 @@ static NSString *mailETag = nil;
   [super appendToResponse: _response inContext: _ctx];
   
   [[_ctx popMailRenderingContext] reset];
-
-  conn = [[self clientObject] imap4Connection];
-  [[conn client] logout];
 }
 
 @end /* UIxMailView */