2 files changed, 5 insertions, 3 deletions
diff --git a/driver.c b/driver.c
index a2288654..b424151d 100644
--- a/driver.c
+++ b/driver.c
@@ -76,8 +76,8 @@ struct method *proto;
 	goto closeUp;
     }
 
-    /* accept greeting message from IMAP server */
-    ok = imap_ok(buf,socket);
+    /* accept greeting message from server */
+    ok = (protocol->parse_response)(buf, socket);
     if (ok != 0) {
 	if (ok != PS_SOCKET)
 	    gen_transact(socket, protocol->exit_cmd);
diff --git a/imap.c b/imap.c
index e1d7dab9..fa1e9551 100644
--- a/imap.c
+++ b/imap.c
@@ -64,8 +64,10 @@ int socket;
   } while
       (tag[0] != '\0' && strncmp(buf, tag, strlen(tag)));
 
-  if (tag[0] == '\0')
+  if (tag[0] == '\0') {
+    strcpy(argbuf, buf);
     return(0); 
+  }
   else {
     if (strncmp(buf + TAGLEN + 1, "OK", 2) == 0) {
       strcpy(argbuf, buf + TAGLEN);