diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c
index 34a244c82587fc29e6ca0066f4ff326f7715f14b..8892c52802f48ed2d036177e209e0d3c447e0dbb 100644
--- a/src/sbbs3/sbbsecho.c
+++ b/src/sbbs3/sbbsecho.c
@@ -2257,7 +2257,7 @@ BOOL DLLCALL get_msg_by_ftn_id(smb_t* smb, char* id, smbmsg_t* msg)
 {
 	ulong		n;
 	
-	for(n=0;n<smb->status.last_msg;n++) {
+	for(n=0;n<smb->status.total_msgs;n++) {
 		memset(msg,0,sizeof(smbmsg_t));
 		msg->offset=n;
 		if(smb_getmsgidx(smb, msg)!=0)
@@ -4125,14 +4125,8 @@ int main(int argc, char **argv)
 #endif
 		,revision
 		);
-#if 0
-	putenv("TZ=UTC0");
-#endif
 
 	putenv("TMP=");
-#if !defined(__unix__)
-	_fmode=O_BINARY;
-#endif
 	setvbuf(stdout,NULL,_IONBF,0);
 
 	sub_code[0]=0;