+
+
+static gint
+count_addresses (const gchar* addresses)
+{
+ gint count = 1;
+
+ if (!addresses)
+ return 0;
+
+ while (*addresses) {
+ if (*addresses == ',' || *addresses == ';')
+ ++count;
+ ++addresses;
+ }
+
+ return count;
+}
+
+
+/* get the new To:, based on the old header,
+ * result is newly allocated or NULL in case of error
+ * */
+static gchar*
+get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
+ ModestTnyMsgReplyMode reply_mode)
+{
+ gchar* old_reply_to;
+ gchar* old_from;
+ gchar* new_to;
+
+ /* according to RFC2369 (http://www.faqs.org/rfcs/rfc2369.html), we
+ * can identify Mailing-List posts by the List-Help header.
+ * for mailing lists, both the Reply-To: and From: should be included
+ * in the new To:; for now, we're ignoring List-Post
+ */
+ gchar* list_help = modest_tny_mime_part_get_header_value (TNY_MIME_PART(msg),
+ "List-Help");
+ gboolean is_mailing_list = (list_help != NULL);
+ g_free (list_help);
+
+
+ /* reply to sender, use ReplyTo or From */
+ old_reply_to = modest_tny_mime_part_get_header_value (TNY_MIME_PART(msg),
+ "Reply-To");
+ old_from = tny_header_dup_from (header);
+
+ if (!old_from && !old_reply_to) {
+ g_warning ("%s: failed to get either Reply-To: or From: from header",
+ __FUNCTION__);
+ return NULL;
+ }
+
+ /* for mailing lists, use both Reply-To and From if we did a
+ * 'Reply All:'
+ * */
+ if (is_mailing_list && reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL &&
+ old_reply_to && old_from && strcmp (old_from, old_reply_to) != 0)
+ new_to = g_strjoin (",", old_reply_to, old_from, NULL);
+ else
+ /* otherwise use either Reply-To: (preferred) or From: */
+ new_to = g_strdup (old_reply_to ? old_reply_to : old_from);
+ g_free (old_from);
+ g_free (old_reply_to);
+
+ /* in case of ReplyAll, we need to add the Recipients in the old To: */
+ if (reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL) {
+ gchar *old_to = tny_header_dup_to (header);
+ if (!old_to)
+ g_warning ("%s: no To: address found in source mail",
+ __FUNCTION__);
+ else {
+ /* append the old To: */
+ gchar *tmp = g_strjoin (",", new_to, old_to, NULL);
+ g_free (new_to);
+ new_to = tmp;
+ g_free (old_to);
+ }
+
+ /* remove duplicate entries */
+ gchar *tmp = modest_text_utils_remove_duplicate_addresses (new_to);
+ g_free (new_to);
+ new_to = tmp;
+
+ /* now, strip me (the new From:) from the new_to, but only if
+ * there are >1 addresses there */
+ if (count_addresses (new_to) > 1) {
+ gchar *tmp = modest_text_utils_remove_address (new_to, from);
+ g_free (new_to);
+ new_to = tmp;
+ }
+ }
+
+ return new_to;
+}
+
+
+/* get the new Cc:, based on the old header,
+ * result is newly allocated or NULL in case of error */
+static gchar*
+get_new_cc (TnyHeader *header, const gchar* from)
+{
+ gchar *old_cc, *result, *dup;
+
+ old_cc = tny_header_dup_cc (header);
+ if (!old_cc)
+ return NULL;
+
+ /* remove me (the new From:) from the Cc: list */
+ dup = modest_text_utils_remove_address (old_cc, from);
+ result = modest_text_utils_remove_duplicate_addresses (dup);
+ g_free (dup);
+ g_free (old_cc);
+ return result;
+}
+
+