streamline headers

[apps/madmutt.git] / recvcmd.c

diff --git a/recvcmd.c b/recvcmd.c
index d9dd323..88cec92 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -161,13 +161,10 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     address_list_wipe(&adr);
-    CLEARLINE(main_w, LINES - 1);
     mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
     return;
   }
 
-  CLEARLINE(main_w, LINES - 1);
-
   if (cur)
     ret = mutt_bounce_message (fp, cur->hdr, adr);
   else {
@@ -709,37 +706,25 @@ attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
     return -1;
   }
 
-#ifdef USE_NNTP
-  if ((flags & SENDNEWS)) {
-    /* in case followup set Newsgroups: with Followup-To: if it present */
-    if (!env->newsgroups && curenv &&
-        m_strcasecmp(curenv->followup_to, "poster"))
-      env->newsgroups = m_strdup(curenv->followup_to);
-  }
-  else
-#endif
-  {
-    if (parent) {
-      if (mutt_fetch_recips (env, curenv, flags) == -1)
+  if (parent) {
+    if (mutt_fetch_recips (env, curenv, flags) == -1)
+      return -1;
+  } else {
+    for (i = 0; i < idxlen; i++) {
+      if (idx[i]->content->tagged
+          && mutt_fetch_recips (env, idx[i]->content->hdr->env,
+                                flags) == -1)
         return -1;
     }
-    else {
-      for (i = 0; i < idxlen; i++) {
-        if (idx[i]->content->tagged
-            && mutt_fetch_recips (env, idx[i]->content->hdr->env,
-                                  flags) == -1)
-          return -1;
-      }
-    }
-
-    if ((flags & SENDLISTREPLY) && !env->to) {
-      mutt_error _("No mailing lists found!");
+  }
 
-      return (-1);
-    }
+  if ((flags & SENDLISTREPLY) && !env->to) {
+    mutt_error _("No mailing lists found!");
 
-    mutt_fix_reply_recipients (env);
+    return (-1);
   }
+
+  mutt_fix_reply_recipients (env);
   mutt_make_misc_reply_headers (env, Context, curhdr, curenv);
 
   if (parent)
@@ -797,13 +782,6 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
   char prefix[STRING];
   int rc;
 
-#ifdef USE_NNTP
-  if (flags & SENDNEWS)
-    set_option (OPTNEWSSEND);
-  else
-    unset_option (OPTNEWSSEND);
-#endif
-
   if (check_all_msg (idx, idxlen, cur, 0) == -1) {
     nattach = count_tagged (idx, idxlen);
     if ((parent = find_parent (idx, idxlen, cur, nattach)) == NULL)