diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c
index 2f9e5fb90b68fc2613b94dfaaf3d4b4b55bb36c5..663a4cf2cae1f24ad1a8108d5364eb5ea18fa394 100644
--- a/src/sbbs3/sbbsecho.c
+++ b/src/sbbs3/sbbsecho.c
@@ -939,7 +939,7 @@ enum arealist_type {
 void netmail_arealist(enum arealist_type type, fidoaddr_t addr, const char* to)
 {
 	char str[256],title[128],match,*p,*tp;
-	unsigned k,x,y;
+	unsigned k,x;
 	unsigned u;
 	str_list_t	area_list;
 
@@ -2228,6 +2228,9 @@ ulong loadmsgs(post_t** post, ulong ptr)
 		if(idx.number==0)	/* invalid message number, ignore */
 			continue;
 
+		if(idx.attr&(MSG_VOTE|MSG_POLL))
+			continue;
+
 		if(idx.number<=ptr || (idx.attr&MSG_DELETE))
 			continue;
 
@@ -3936,6 +3939,9 @@ void export_echomail(const char* sub_code, const nodecfg_t* nodecfg, bool rescan
 				continue; 
 			}
 
+			if(msg.hdr.type != SMB_MSG_TYPE_NORMAL)
+				continue;
+
 			memset(&hdr,0,sizeof(fmsghdr_t));	 /* Zero the header */
 			hdr.origzone=scfg.sub[i]->faddr.zone;
 			hdr.orignet=scfg.sub[i]->faddr.net;