1 files changed, 7 insertions, 1 deletions
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 362083ee9e..19e46073b2 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -175,7 +175,13 @@ config_cache_labels (void)
 			
 			*colour++ = '\0';
 			label->tag = g_strdup(label_defaults[num].tag);
-			label->name = g_strdup (_(buf));
+
+			/* Don't translate an empty string */			
+			if (buf == NULL || buf[0] == '\0')
+			        label->name = g_strdup (_("Unnamed"));
+			else
+			        label->name = g_strdup (_(buf));
+
 			label->colour = g_strdup (colour);
 			
 			n = g_slist_alloc ();