From 38cfbbb6daafdd576ca93206cd7411e43e88a514 Mon Sep 17 00:00:00 2001
From: Christoph Hohmann <reboot@gmx.ch>
Date: Tue, 12 Feb 2002 00:43:44 +0000
Subject: [PATCH] * src/compose.c         always delete message from queue
 after sending/send error         (closes bug #509601 "puting message on queue
 when send fails")

---
 ChangeLog.claws | 6 ++++++
 configure.in    | 2 +-
 src/compose.c   | 7 +++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 720e07ec2..2224b79a0 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-02-12 [christoph]	0.7.0claws63
+
+	* src/compose.c
+		always delete message from queue after sending/send error
+		(closes bug #509601)
+
 2002-02-12 [melvin]	0.7.0claws62
 
 	* src/prefs_actions.c
diff --git a/configure.in b/configure.in
index 7fe39b1df..36ddc4181 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws62
+EXTRA_VERSION=claws63
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index 96293c194..5e700bdc2 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -2742,10 +2742,9 @@ gint compose_send(Compose *compose)
 	}
 	
 	val = procmsg_send_message_queue(folder_item_fetch_msg(folder, msgnum));
-	if(!val) {
-		folder_item_remove_msg(folder, msgnum);
-		folderview_update_item(folder, TRUE);
-	}
+
+	folder_item_remove_msg(folder, msgnum);
+	folderview_update_item(folder, TRUE);
 
 	return val;
 }
-- 
2.25.1