diff -ru dbmail-2.2.3.orig/imap4.c dbmail-2.2.3/imap4.c
--- dbmail-2.2.3.orig/imap4.c	2007-02-28 11:34:28.000000000 +0100
+++ dbmail-2.2.3/imap4.c	2007-02-28 18:30:58.000000000 +0100
@@ -117,8 +117,8 @@
 
 	/* greet user */
 	if (dbmail_imap_session_printf(session,
-		     "* OK dbmail imap (protocol version 4r1) server %s "
-		     "ready to run\r\n", IMAP_SERVER_VERSION) < 0) {
+		     "* OK imap (protocol version 4r1) server "
+		     "ready \r\n", IMAP_SERVER_VERSION) < 0) {
 		dbmail_imap_session_delete(session);
 		return EOF;
 	}
Only in dbmail-2.2.3/: imap4.c.orig
diff -ru dbmail-2.2.3.orig/imapcommands.c dbmail-2.2.3/imapcommands.c
--- dbmail-2.2.3.orig/imapcommands.c	2007-02-08 13:52:22.000000000 +0100
+++ dbmail-2.2.3/imapcommands.c	2007-02-28 18:30:58.000000000 +0100
@@ -111,7 +111,7 @@
 	dbmail_imap_session_set_state(self,IMAPCS_LOGOUT);
 	TRACE(TRACE_MESSAGE, "user (id:%llu) logging out @ [%s]", ud->userid, timestring);
 
-	dbmail_imap_session_printf(self, "* BYE dbmail imap server kisses you goodbye\r\n");
+	dbmail_imap_session_printf(self, "* BYE\r\n");
 
 	return 0;
 }
diff -ru dbmail-2.2.3.orig/lmtp.c dbmail-2.2.3/lmtp.c
--- dbmail-2.2.3.orig/lmtp.c	2006-11-06 09:32:31.000000000 +0100
+++ dbmail-2.2.3/lmtp.c	2007-02-28 18:30:58.000000000 +0100
@@ -134,7 +134,7 @@
 
 	if (ci->tx) {
 		/* sending greeting */
-		ci_write(ci->tx, "220 %s DBMail LMTP service ready to rock\r\n", myhostname);
+		ci_write(ci->tx, "220 %s LMTP service ready\r\n", myhostname);
 		fflush(ci->tx);
 	} else {
 		TRACE(TRACE_MESSAGE, "TX stream is null!");
diff -ru dbmail-2.2.3.orig/pop3.c dbmail-2.2.3/pop3.c
--- dbmail-2.2.3.orig/pop3.c	2007-02-26 09:23:25.000000000 +0100
+++ dbmail-2.2.3/pop3.c	2007-02-28 18:30:58.000000000 +0100
@@ -97,7 +97,7 @@
 
 	if (ci->tx) {
 		/* sending greeting */
-		fprintf(ci->tx, "+OK DBMAIL pop3 server ready to rock %s\r\n",
+		fprintf(ci->tx, "+OK pop3 server ready\r\n",
 			session.apop_stamp);
 		fflush(ci->tx);
 	} else {
@@ -177,7 +177,7 @@
 
 			/* if everything went well, write down everything and do a cleanup */
 			db_update_pop(&session);
-			fprintf(ci->tx, "+OK see ya later\r\n");
+			fprintf(ci->tx, "+OK bye\r\n");
 			fflush(ci->tx);
 			break;