--- src/imap-login/imap-proxy.c.orig    Tue Nov  7 10:13:55 2006
+++ src/imap-login/imap-proxy.c Fri Jan  5 11:29:31 2007
@@ -70,12 +70,19 @@
                client->io = io_add(client->common.fd, IO_READ,
                                    client_input, client);
 
+/*
+ * [BMW] This appears to cause the connection to drop on an incorrect password.
+ *
+
                login_proxy_free(client->proxy);
                client->proxy = NULL;
 
                i_free(client->proxy_user);
                client->proxy_user = NULL;
                client_unref(client);
+
+*/
+
                return -1;
        } else {
                /* probably some untagged reply */
--- src/pop3-login/pop3-proxy.c.orig    Tue Nov  7 10:17:14 2006
+++ src/pop3-login/pop3-proxy.c Fri Jan  5 11:29:53 2007
@@ -120,6 +120,10 @@
        client->io = io_add(client->common.fd, IO_READ,
                            client_input, client);
 
+/*
+ * [BMW] This appears to cause the connection to drop on an incorrect password.
+ * 
+
        login_proxy_free(client->proxy);
        client->proxy = NULL;
 
@@ -134,6 +138,7 @@
        client->proxy_user = NULL;
 
        client_unref(client);
+*/
 }
 
 int pop3_proxy_new(struct pop3_client *client, const char *host,
