diff --git a/src/sbbs3/getmsg.cpp b/src/sbbs3/getmsg.cpp
index db56cb9cfc8a3d403308a4973de43b59b4bb906a..8fb663fbfad6c329890dc6be78ed73703a8139b0 100644
--- a/src/sbbs3/getmsg.cpp
+++ b/src/sbbs3/getmsg.cpp
@@ -136,6 +136,8 @@ void sbbs_t::show_msghdr(smbmsg_t* msg)
 		menu("msghdr");
 	} else {
 		bprintf(text[MsgSubj],msg->subj);
+		if(msg->tags && *msg->tags)
+			bprintf(text[MsgTags], msg->tags);
 		if(msg->hdr.attr)
 			show_msgattr(msg);
 		if(msg->to && *msg->to) {
diff --git a/src/sbbs3/text.h b/src/sbbs3/text.h
index c6e62f74a58a1971e4b4a19baf78753f6245a8b5..99d52f11ebe71ee272360cd326917f6909d4b119 100644
--- a/src/sbbs3/text.h
+++ b/src/sbbs3/text.h
@@ -815,6 +815,7 @@ enum {
 	,VoteNoticeFmt
 	,TagMessageQ
 	,TagMessagePrompt
+	,MsgTags
 
 	,TOTAL_TEXT
 };
diff --git a/src/sbbs3/text_defaults.c b/src/sbbs3/text_defaults.c
index 10812031896f2ffef9ca85dc5bd4336edd9d989f..65f2dad85f9e88bda75ca970057cd262bdba0eb3 100644
--- a/src/sbbs3/text_defaults.c
+++ b/src/sbbs3/text_defaults.c
@@ -1327,7 +1327,7 @@ const char * const text_defaults[TOTAL_TEXT]={
 	,"\x52\x65\x6d\x6f\x76\x65\x20\x66\x69\x6c\x65" // 800 RemoveFileQ
 	,"\x4f\x72\x69\x67\x69\x6e\x61\x74\x69\x6e\x67\x20\x41\x64\x64\x72\x65\x73\x73" // 801 OriginFidoAddr
 	,"\x01\x6e\x01\x68\xfb\x20\x01\x6d\x25\x2e\x37\x37\x73\x0d\x0a" // 802 VoteNoticeFmt
-	,"\x54\x61\x67\x20\x74\x68\x69\x73\x20\x6d\x65\x73\x73\x61\x67\x65\x3f" // 803 TagMessageQ
-	,"\x54\x61\x67\x20\x28\x6f\x72\x20\x45\x4e\x54\x45\x52\x20\x74\x6f\x20\x73\x74\x6f\x70\x20\x74\x61\x67\x67\x69\x6e\x67\x29\x3a\x20"
-		"" // 804 TagMessagePrompt
+	,"\x0d\x0a\x54\x61\x67\x20\x74\x68\x69\x73\x20\x6d\x65\x73\x73\x61\x67\x65" // 803 TagMessageQ
+	,"\x45\x6e\x74\x65\x72\x20\x28\x73\x70\x61\x63\x65\x2d\x73\x65\x70\x61\x72\x61\x74\x65\x64\x29\x20\x54\x61\x67\x73\x3a\x20" // 804 TagMessagePrompt
+	,"\x0d\x0a\xb3\x20\x01\x62\x54\x61\x67\x73\x01\x6e\x01\x62\x3a\x20\x01\x68\x01\x63\x25\x2e\x37\x30\x73" // 805 MsgTags
 };