diff --git a/ChangeLog b/ChangeLog
index 1de228d0c..2fa3c237f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/MailerUI/UIxMailView.m ([UIxMailView
+	-appendToResponse:_responseinContext:_ctx]): logout from the imap
+	connectin once the response has been appended.
+
 2008-08-29  Ludovic Marcotte <lmarcotte@inverse.ca>
 
 	* SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject
diff --git a/UI/MailerUI/UIxMailView.m b/UI/MailerUI/UIxMailView.m
index 4b3f2cda5..eaf7bb234 100644
--- a/UI/MailerUI/UIxMailView.m
+++ b/UI/MailerUI/UIxMailView.m
@@ -26,6 +26,8 @@
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSException+misc.h>
 #import <NGExtensions/NSString+misc.h>
+#import <NGImap4/NGImap4Client.h>
+#import <NGImap4/NGImap4Connection.h>
 #import <NGImap4/NGImap4Envelope.h>
 #import <NGImap4/NGImap4EnvelopeAddress.h>
 #import <SoObjects/Mailer/SOGoMailObject.h>
@@ -209,7 +211,7 @@ static NSString *mailETag = nil;
 		inContext: (WOContext *) _ctx
 {
   UIxMailRenderingContext *mctx;
-  SOGoMailFolder *mailFolder;
+  NGImap4Connection *conn;
 
   if (mailETag != nil)
     [[_ctx response] setHeader:mailETag forKey:@"etag"];
@@ -224,8 +226,8 @@ static NSString *mailETag = nil;
   
   [[_ctx popMailRenderingContext] reset];
 
-  mailFolder = [[self clientObject] container];
-  [mailFolder unselect];
+  conn = [[self clientObject] imap4Connection];
+  [[conn client] logout];
 }
 
 @end /* UIxMailView */