2010-09-12 [pawel] 3.7.6cvs34

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index ee357a94fb73165c26dfc877316523c40db687d0..d88315a1ac6fb37c2be4844cab28ea883ff0b02b 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3214,7 +3214,9 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
                                 compose->followup_to ? compose->followup_to :
                                 compose->newsgroups ? compose->newsgroups : "",
                                 COMPOSE_NEWSGROUPS, PREF_NONE);
-               } 
+               } else if (reply_to_ml)
+                       compose_entry_append(compose,
+                                  compose->ml_post, COMPOSE_TO, PREF_ML); 
                else 
                        compose_entry_append
                                (compose,
@@ -3225,7 +3227,7 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
        compose_reply_set_subject(compose, msginfo);
 
        if (to_ml && compose->ml_post) return;
-       if (!to_all || compose->account->protocol == A_NNTP) return;
+       if (!to_all) return;
 
        if (compose->replyto) {
                Xstrdup_a(replyto, compose->replyto, return);
@@ -7398,6 +7400,10 @@ static Compose *compose_create(PrefsAccount *account,
        gtk_widget_set_size_request(scrolledwin, prefs_common.compose_width, -1);
 
        text = gtk_text_view_new();
+       if (prefs_common.show_compose_margin) {
+               gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text), 6);
+               gtk_text_view_set_right_margin(GTK_TEXT_VIEW(text), 6);
+       }
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD_CHAR);
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), TRUE);