--- balsa-1.4.1.org/src/sendmsg-window.c	Sat Sep  7 00:10:03 2002
+++ balsa-1.4.1/src/sendmsg-window.c	Sat Nov 16 21:08:10 2002
@@ -2790,6 +2814,16 @@
 
 	gtk_entry_set_text(GTK_ENTRY(msg->cc[1]), tmp);
 	g_free(tmp);
+
+	/* If "Return-Path" is set the address in "From" will be skipped
+	   when construction "To" above */
+	if (message->reply_to) {
+	    gtk_entry_append_text(GTK_ENTRY(msg->cc[1]), ", ");
+
+	    tmp = libbalsa_address_to_gchar(message->from, 0);
+	    gtk_entry_append_text(GTK_ENTRY(msg->cc[1]), tmp);
+	    g_free(tmp);
+	}
 
 	if (message->cc_list) {
 	    gtk_entry_append_text(GTK_ENTRY(msg->cc[1]), ", ");