2007-09-21 [mones] 3.0.1cvs17

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index f006de02ded189e7be72c0c690b93c0fdc28f81c..cfc33e50febb59e112565dca851e03a0e66f81cd 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1304,6 +1304,10 @@ static Compose *compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar
                g_warning("compose_reply_mode(): invalid Compose Mode: %d\n", mode);
        }
        
+       if (compose == NULL) {
+               alertpanel_error(_("Unable to reply. The original email probably doesn't exist."));
+               return NULL;
+       }
        ifactory = gtk_item_factory_from_widget(compose->menubar);
 
        compose->rmode = mode;
@@ -9981,7 +9985,7 @@ static void compose_reply_from_messageview_real(MessageView *msgview, GSList *ms
        } else
                compose = compose_reply_mode((ComposeMode)action, msginfo_list, body);
 
-       if (originally_enc) {
+       if (compose && originally_enc) {
                compose_force_encryption(compose, compose->account, FALSE);
        }