diff --git a/src/mail_menu.c b/src/mail_menu.c
index 291e26f..041bf00 100644
--- a/src/mail_menu.c
+++ b/src/mail_menu.c
@@ -516,8 +516,10 @@ char *external_editor(struct user_record *user, char *to, char *from, char *quot
 				}
 				if (user->autosig) {
 					body2 = (char *)malloz(totlen + 3 + strlen(buffer) + strlen(user->signature));
+					totlen += strlen(buffer) + strlen(user->signature) + 3;
 				} else {
 					body2 = (char *)malloz(totlen + 2 + strlen(buffer));
+					totlen += strlen(buffer) + 2;
 				}
 			} else {
 				body2 = (char *)malloz(totlen + 1);