diff --git a/ChangeLog b/ChangeLog
index 65061810..41dc9d63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-26  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* libmisc/mail.c: Avoid implicit conversion of pointers to
+	booleans.
+	* libmisc/mail.c: Avoid assignments in comparisons.
+
 2008-05-26  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* libmisc/loginprompt.c: Avoid implicit conversion of pointers /
diff --git a/libmisc/mail.c b/libmisc/mail.c
index 857a0768..3c57af0f 100644
--- a/libmisc/mail.c
+++ b/libmisc/mail.c
@@ -52,7 +52,8 @@ void mailcheck (void)
 	/*
 	 * Check incoming mail in Maildir format - J.
 	 */
-	if ((mailbox = getenv ("MAILDIR"))) {
+	mailbox = getenv ("MAILDIR");
+	if (NULL != mailbox) {
 		char *newmail;
 
 		newmail = xmalloc (strlen (mailbox) + 5);