diff --git a/src/drv_imap.c b/src/drv_imap.c
index 9cd2c8d..1697fcb 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -701,6 +701,10 @@ parse_imap_list( imap_store_t *ctx, char **sp, parse_list_state_t *sts )
 		  getline:
 			if (!(s = socket_read_line( &ctx->conn )))
 				goto postpone;
+			if (DFlags & VERBOSE) {
+				puts( s );
+				fflush( stdout );
+			}
 		} else if (*s == '"') {
 			/* quoted string */
 			s++;
@@ -1162,6 +1166,10 @@ imap_socket_read( void *aux )
 		}
 		if (!(cmd = socket_read_line( &ctx->conn )))
 			return;
+		if (DFlags & VERBOSE) {
+			puts( cmd );
+			fflush( stdout );
+		}
 
 		arg = next_arg( &cmd );
 		if (!arg) {
diff --git a/src/socket.c b/src/socket.c
index 26249cd..c819395 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -591,10 +591,6 @@ socket_read_line( conn_t *b )
 	if (p != s && p[-1] == '\r')
 		p--;
 	*p = 0;
-	if (DFlags & VERBOSE) {
-		puts( s );
-		fflush( stdout );
-	}
 	return s;
 }