From ffc6f62d509c95e80a4524e18f587c03a6d10ef6 Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Mon, 20 Oct 2014 18:44:59 +0200
Subject: [PATCH] - patch with new `keep_to' option to better handle corporate
 world - rel 2

---
 mutt-keep_to.patch | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 mutt.spec          |  4 +++-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 mutt-keep_to.patch

diff --git a/mutt-keep_to.patch b/mutt-keep_to.patch
new file mode 100644
index 0000000..1dcbb4c
--- /dev/null
+++ b/mutt-keep_to.patch
@@ -0,0 +1,47 @@
+Add keep_to option to control where To: recipients are copied on group-reply (To: or Cc:).
+
+author: Jan Palus
+
+diff -urN mutt-1.5.23.orig/send.c mutt-1.5.23/send.c
+--- mutt-1.5.23.orig/send.c	2014-10-12 16:55:39.680846728 +0200
++++ mutt-1.5.23/send.c	2014-10-12 16:55:52.104179682 +0200
+@@ -557,7 +557,11 @@
+     if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != M_YES))
+     {
+       /* if(!mutt_addr_is_user(in->to)) */
+-      rfc822_append (&out->cc, in->to, 1);
++      if (option (OPTKEEPTO)) {
++        rfc822_append (&out->to, in->to, 1);
++      } else {
++        rfc822_append (&out->cc, in->to, 1);
++      }
+       rfc822_append (&out->cc, in->cc, 1);
+     }
+   }
+diff -ur mutt-1.5.23.orig/init.h mutt-1.5.23/init.h
+--- mutt-1.5.23.orig/init.h	2014-10-12 17:17:05.716118306 +0200
++++ mutt-1.5.23/init.h	2014-10-12 17:24:08.119438749 +0200
+@@ -1344,6 +1344,12 @@
+   ** from your spool mailbox to your $$mbox mailbox, or as a result of
+   ** a ``$mbox-hook'' command.
+   */
++  { "keep_to", DT_BOOL, R_NONE, OPTKEEPTO, 0 },
++  /*
++  ** .pp
++  ** Controls where recipients from ``To:'' list go on group-reply. If \fIset\fP
++  ** they are copied to ``To:'' otherwise to ``Cc:''.
++  */
+   { "locale",		DT_STR,  R_BOTH, UL &Locale, UL "C" },
+   /*
+   ** .pp
+diff -ur mutt-1.5.23.orig/mutt.h mutt-1.5.23/mutt.h
+--- mutt-1.5.23.orig/mutt.h	2014-10-12 17:17:05.722784972 +0200
++++ mutt-1.5.23/mutt.h	2014-10-12 17:24:50.006104137 +0200
+@@ -391,6 +391,7 @@
+   OPTIMPLICITAUTOVIEW,
+   OPTINCLUDEONLYFIRST,
+   OPTKEEPFLAGGED,
++  OPTKEEPTO,
+   OPTMAILCAPSANITIZE,
+   OPTMAILCHECKRECENT,
+   OPTMAILDIRTRASH,
diff --git a/mutt.spec b/mutt.spec
index de18bdf..359d805 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -29,7 +29,7 @@ Summary(tr.UTF-8):	Mutt elektronik posta programı
 Summary(uk.UTF-8):	Поштова клієнтська програма Mutt
 Name:		mutt
 Version:	1.5.23
-Release:	1
+Release:	2
 Epoch:		6
 License:	GPL v2+
 Group:		Applications/Mail
@@ -70,6 +70,7 @@ Patch23:	%{name}-db.patch
 # http://mutt.org.ua/download/
 Patch24:	%{name}-vvv.nntp.patch
 Patch25:	format-security.patch
+Patch26:	%{name}-keep_to.patch
 URL:		http://www.mutt.org/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1.6
@@ -180,6 +181,7 @@ Mutt - це невеликий, але потужний повноекранни
 %patch23 -p1
 %{?with_nntp:%patch24 -p1}
 %patch25 -p1
+%patch26 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 %{__rm} doc/{manual*.html,manual.txt}
-- 
2.43.0