diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index e9b733ba9a..16e52ad775 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -587,7 +587,7 @@ mail_browser_dispose (GObject *object)
 	if (priv->message_list != NULL) {
 		/* This will cancel a regen operation. */
 		gtk_widget_destroy (priv->message_list);
-		priv->message_list = NULL;
+		g_clear_object (&priv->message_list);
 	}
 
 	/* Chain up to parent's dispose() method. */