diff --git a/src/sbbs3/email.cpp b/src/sbbs3/email.cpp
index aa0a2a78303793bc5895ab2b40518fb81704835e..1aef6eb1bff87763c6e9875901b3bf63eaef4e1c 100644
--- a/src/sbbs3/email.cpp
+++ b/src/sbbs3/email.cpp
@@ -273,8 +273,7 @@ bool sbbs_t::email(int usernumber, char *top, char *subj, long mode)
 
 	smb_dfield(&msg,TEXT_BODY,length);
 
-	smb_unlocksmbhdr(&smb);
-	i=smb_addmsghdr(&smb,&msg,SMB_SELFPACK);
+	i=smb_addmsghdr(&smb,&msg,SMB_SELFPACK); // calls smb_unlocksmbhdr() 
 	smb_close(&smb);
 	smb_stack(&smb,SMB_STACK_POP);
 
diff --git a/src/sbbs3/netmail.cpp b/src/sbbs3/netmail.cpp
index 19a51c0ec0e118cad6e8cff4421c9948986ef256..049306ff97ca1f215e9cbd96c639fcdf685f845e 100644
--- a/src/sbbs3/netmail.cpp
+++ b/src/sbbs3/netmail.cpp
@@ -247,8 +247,7 @@ bool sbbs_t::inetmail(char *into, char *subj, long mode)
 
 	smb_dfield(&msg,TEXT_BODY,length);
 
-	smb_unlocksmbhdr(&smb);
-	i=smb_addmsghdr(&smb,&msg,SMB_SELFPACK);
+	i=smb_addmsghdr(&smb,&msg,SMB_SELFPACK);	// calls smb_unlocksmbhdr() 
 	smb_close(&smb);
 	smb_stack(&smb,SMB_STACK_POP);
 
@@ -435,8 +434,7 @@ bool sbbs_t::qnetmail(char *into, char *subj, long mode)
 
 	smb_dfield(&msg,TEXT_BODY,length);
 
-	smb_unlocksmbhdr(&smb);
-	i=smb_addmsghdr(&smb,&msg,SMB_SELFPACK);
+	i=smb_addmsghdr(&smb,&msg,SMB_SELFPACK); // calls smb_unlocksmbhdr() 
 	smb_close(&smb);
 	smb_stack(&smb,SMB_STACK_POP);
 
diff --git a/src/sbbs3/writemsg.cpp b/src/sbbs3/writemsg.cpp
index 67cd052ef7a4f4cb66af8384b37c2126a4f99663..ab25e2675db3041d4a9c98db685afb3aafd58d83 100644
--- a/src/sbbs3/writemsg.cpp
+++ b/src/sbbs3/writemsg.cpp
@@ -1213,14 +1213,12 @@ bool sbbs_t::movemsg(smbmsg_t* msg, uint subnum)
 	msg->hdr.offset=offset;
 	msg->hdr.version=smb_ver();
 
-	smb_unlocksmbhdr(&smb);
-
 	fseek(smb.sdt_fp,offset,SEEK_SET);
 	fwrite(buf,length,1,smb.sdt_fp);
 	fflush(smb.sdt_fp);
 	FREE(buf);
 
-	i=smb_addmsghdr(&smb,msg,storage);
+	i=smb_addmsghdr(&smb,msg,storage);	// calls smb_unlocksmbhdr() 
 	smb_close(&smb);
 	smb_stack(&smb,SMB_STACK_POP);