--- a/session.c	Wed Aug 27 10:36:03 2014 +0500
+++ b/session.c	Wed Aug 27 16:21:31 2014 +0500
@@ -133,7 +133,7 @@
 
 	entry = SPLAY_REMOVE(session_tree, &sessions,  s);
 	if (entry == NULL) {
-		 /* STARTTLS session was in progress and got interrupted */
+		/* STARTTLS session was in progress and got interrupted */
 		logit(LOG_DEBUG, "%u: not in tree", s->id);
 		entry = s;
 	}
@@ -436,7 +436,7 @@
 void
 session_imsgev_init(struct session *s, int fd)
 {
-	imsgev_init(&s->iev_maildrop, fd, s, maildrop_imsgev, needfd);
+	imsgev_init(&s->iev_maildrop, fd, NULL, maildrop_imsgev, needfd);
 }
 
 static void