diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp
index 81153ae322..f52b0a5952 100644
--- a/src/apps/mail/MailWindow.cpp
+++ b/src/apps/mail/MailWindow.cpp
@@ -2173,9 +2173,8 @@ TMailWindow::Send(bool now)
 	mail_encoding encodingForHeaders = quoted_printable;
 
 	if (!now) {
-		status_t status;
-
-		if ((status = SaveAsDraft()) != B_OK) {
+		status_t status = SaveAsDraft();
+		if (status != B_OK) {
 			beep();
 			(new BAlert("",
 				MDR_DIALECT_CHOICE ("E-mail draft could not be saved!","ドラフトは保存できませんでした。"),
@@ -2552,7 +2551,6 @@ TMailWindow::SaveAsDraft()
 	BNodeInfo info(&draft);
 	info.SetType(kDraftType);
 
-	fSent = true;
 	fDraft = true;
 	fChanged = false;