diff --git a/widgets/mu-msg-view.c b/widgets/mu-msg-view.c
index a9c8b83d..97dc2e0e 100644
--- a/widgets/mu-msg-view.c
+++ b/widgets/mu-msg-view.c
@@ -253,6 +253,9 @@ mu_msg_view_set_message (MuMsgView *self, MuMsg *msg)
 	self->_priv->_msg = msg ? mu_msg_ref (msg) : NULL;
 
 	remove_widgets (self);
+
+	if (!msg)
+		return;
 	
 	if (!self->_priv->_view_source)
 		gtk_box_pack_start (GTK_BOX(self),