X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=thread.c;h=0012ec2a2ecae742ae43bac7c22ed3ba9cbd12a8;hp=675f0119fa4dd606213376f3ecc89556f8d0f6da;hb=4ca1867975c2c1f247557d4f33ea6ca6dbe9eae0;hpb=f404a0ca916be07049af51a3022baaaaab94def6

diff --git a/thread.c b/thread.c
index 675f011..0012ec2 100644
--- a/thread.c
+++ b/thread.c
@@ -1377,14 +1377,12 @@ static void clean_references (THREAD *brk, THREAD *cur)
       /* clearing the References: header from obsolete Message-Id(s) */
       mutt_free_list (&ref->next);
 
-#ifdef IMAP_EDIT_THREADS
       if (h->new_env)
 	mutt_free_list (&h->new_env->references);
       else
 	h->new_env = mutt_new_envelope ();
 
       h->new_env->references = mutt_copy_list (h->env->references);
-#endif
 
       h->refs_changed = h->changed = 1;
     }
@@ -1397,7 +1395,6 @@ void mutt_break_thread (HEADER *hdr)
   mutt_free_list (&hdr->env->references);
   hdr->irt_changed = hdr->refs_changed = hdr->changed = 1;
 
-#ifdef IMAP_EDIT_THREADS
   if (hdr->new_env)
   {
     mutt_free_list (&hdr->new_env->in_reply_to);
@@ -1405,7 +1402,6 @@ void mutt_break_thread (HEADER *hdr)
   }
   else
     hdr->new_env = mutt_new_envelope ();
-#endif
 
   clean_references (hdr->thread, hdr->thread->child);
 }
@@ -1420,10 +1416,8 @@ static int link_threads (HEADER *parent, HEADER *child, CONTEXT *ctx)
   child->env->in_reply_to = mutt_new_list ();
   child->env->in_reply_to->data = safe_strdup (parent->env->message_id);
 
-#ifdef IMAP_EDIT_THREADS
   child->new_env->in_reply_to = mutt_new_list ();
   child->new_env->in_reply_to->data = safe_strdup (parent->env->message_id);
-#endif
   
   mutt_set_flag (ctx, child, M_TAG, 0);