diff --git a/parsing.c b/parsing.c
index 4420e58..b86467a 100644
--- a/parsing.c
+++ b/parsing.c
@@ -234,14 +234,19 @@
 		p = strchr(p, '\n') + 1;
 
 	t = strchr(p, '\n');
-	if (t && *t) {
-		ret->subject = substr(p, t);
+	if (t) {
+		if (*t == '\0')
+			ret->subject = strdup("** empty **");
+		else
+			ret->subject = substr(p, t);
 		p = t + 1;
 
 		while (*p == '\n')
 			p = strchr(p, '\n') + 1;
 		ret->msg = p;
-	}
+	} else
+		ret->subject = substr(p, p+strlen(p));
+
 	return ret;
 }