diff --git a/app/Classes/FTN/Message.php b/app/Classes/FTN/Message.php
index 5fb0f50..abc5a9b 100644
--- a/app/Classes/FTN/Message.php
+++ b/app/Classes/FTN/Message.php
@@ -549,7 +549,8 @@ class Message extends FTNBase
 		// Add some kludges
 		$return .= sprintf("\01TZUTC: %s\r",str_replace('+','',$this->mo->date->getOffsetString('')));
 
-		$return .= sprintf("\01MSGID: %s\r",$this->mo->msgid);
+		if ($this->mo->msgid)
+			$return .= sprintf("\01MSGID: %s\r",$this->mo->msgid);
 
 		if ($this->mo->replyid)
 			$return .= sprintf("\01REPLY: %s\r",$this->mo->replyid);