diff --git a/ctrl/text.dat b/ctrl/text.dat
index f682c48e209f25540635048244f8b8858b00b25b..63146fca7d338ea961840f1e6dce5478eef33be5 100644
--- a/ctrl/text.dat
+++ b/ctrl/text.dat
@@ -962,3 +962,5 @@
 "\r\nToggle which vote (up to %u), ~Quit or [Cast]: "           793 BallotVoteWhich
 "Only"									794 Only
 "\1n\1h\1c\r\nSPAM Visibility is now: \1w"	795 SPAMVisibilityIsNow
+"\r\nTo vote in this poll, hit ~V now.\r\n" 796 VoteInThisPollNow
+"\1n\1mMIME-decoded plain-text:\1n\r\n"     797 MIMEDecodedPlainText
\ No newline at end of file
diff --git a/exec/load/text.js b/exec/load/text.js
index 63c1bc20bcb8500cb77940ca8c836d29d6cf8815..635938d84c5fdad3d5ac58553807f171b2af12a1 100644
--- a/exec/load/text.js
+++ b/exec/load/text.js
@@ -804,5 +804,7 @@ var BallotAnswerFmt=792;
 var BallotVoteWhich=793;
 var Only=794;
 var SPAMVisibilityIsNow=795;
+var VoteInThisPollNow=796;
+var MIMEDecodedPlainText=797;
 
-var TOTAL_TEXT=796;
+var TOTAL_TEXT=798;
diff --git a/src/sbbs3/getmsg.cpp b/src/sbbs3/getmsg.cpp
index 3ba36e0d3d8af3dd1ee918fab690ac044c1fa719..bb9db689f0c1fe930b6aa3d65d10cab56606a808 100644
--- a/src/sbbs3/getmsg.cpp
+++ b/src/sbbs3/getmsg.cpp
@@ -248,13 +248,19 @@ void sbbs_t::show_msg(smbmsg_t* msg, long mode, post_t* post)
 			answers++;
 		}
 		if(!msg->user_voted && !(useron.misc&EXPERT) && !(msg->hdr.auxattr&POLL_CLOSED) && !(useron.rest&FLAG('V')))
-			mnemonics("\r\nTo vote in this poll, hit ~V now.\r\n");
+			mnemonics(text[VoteInThisPollNow]);
 		return;
 	}
-	if((txt=smb_getmsgtxt(&smb,msg,(console&CON_RAW_IN) ? 0:GETMSGTXT_PLAIN)) != NULL) {
-		if(!(console&CON_RAW_IN))
-			mode|=P_WORDWRAP;
+	if((txt=smb_getmsgtxt(&smb, msg, 0)) != NULL) {
 		char* p = txt;
+		if(!(console&CON_RAW_IN)) {
+			mode|=P_WORDWRAP;
+			p = smb_getplaintext(msg, txt);
+			if(p == NULL)
+				p = txt;
+			else
+				bputs(text[MIMEDecodedPlainText]);
+		}
 		truncsp(p);
 		SKIP_WHITESPACE(p);
 		putmsg(p, mode);
diff --git a/src/sbbs3/text.h b/src/sbbs3/text.h
index da1b2d07f569a21551629bdc9e4b1334cc12304e..935040e8e75f4d9156dc0f644150aa6b06020518 100644
--- a/src/sbbs3/text.h
+++ b/src/sbbs3/text.h
@@ -806,6 +806,8 @@ enum {
 	,BallotVoteWhich
 	,Only
 	,SPAMVisibilityIsNow
+	,VoteInThisPollNow
+	,MIMEDecodedPlainText
 
 	,TOTAL_TEXT
 };
diff --git a/src/sbbs3/text_defaults.c b/src/sbbs3/text_defaults.c
index 7e8a09af28d6d095576bbbacf949604f53afe849..7871be7f00244493babdf64efabf531283103878 100644
--- a/src/sbbs3/text_defaults.c
+++ b/src/sbbs3/text_defaults.c
@@ -1316,4 +1316,8 @@ const char * const text_defaults[TOTAL_TEXT]={
 	,"\x4f\x6e\x6c\x79" // 794 Only
 	,"\x01\x6e\x01\x68\x01\x63\x0d\x0a\x53\x50\x41\x4d\x20\x56\x69\x73\x69\x62\x69\x6c\x69\x74\x79\x20\x69\x73\x20\x6e\x6f\x77\x3a\x20"
 		"\x01\x77" // 795 SPAMVisibilityIsNow
+	,"\x0d\x0a\x54\x6f\x20\x76\x6f\x74\x65\x20\x69\x6e\x20\x74\x68\x69\x73\x20\x70\x6f\x6c\x6c\x2c\x20\x68\x69\x74\x20\x7e\x56\x20\x6e"
+		"\x6f\x77\x2e\x0d\x0a" // 796 VoteInThisPollNow
+	,"\x01\x6e\x01\x6d\x4d\x49\x4d\x45\x2d\x64\x65\x63\x6f\x64\x65\x64\x20\x70\x6c\x61\x69\x6e\x2d\x74\x65\x78\x74\x3a\x01\x6e\x0d\x0a"
+		"" // 797 MIMEDecodedPlainText
 };