Implemented thread merging

It can happen that thread messages are not delivered in order, which
means we will have to merge threads once all messages are available.

1 files changed, 297 insertions, 0 deletions

diff --git a/tests/threaddata/thread7 b/tests/threaddata/thread7
new file mode 100644
index 0000000..b751d60
--- /dev/null
+++ b/tests/threaddata/thread7
@@ -0,0 +1,297 @@
+Return-Path: <kde-community-bounces@kde.org>
+Received: from imapb010.mykolab.com ([unix socket])
+         by imapb010.mykolab.com (Cyrus 2.5.10-49-g2e214b4-Kolab-2.5.10-8.1.el7.kolab_14) with LMTPA;
+         Thu, 17 Aug 2017 17:40:53 +0200
+X-Sieve: CMU Sieve 2.4
+Received: from int-mx003.mykolab.com (unknown [10.9.13.3])
+        by imapb010.mykolab.com (Postfix) with ESMTPS id 467271505D03E
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 17:40:53 +0200 (CEST)
+Received: from mx.kolabnow.com (unknown [10.9.4.3])
+        by int-mx003.mykolab.com (Postfix) with ESMTPS id 2CC4FF16
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 17:40:53 +0200 (CEST)
+X-Virus-Scanned: amavisd-new at mykolab.com
+Authentication-Results: ext-mx-in003.mykolab.com (amavisd-new);
+        dkim=pass (1024-bit key) header.d=kde.org header.b=rysq5aPx;
+        dkim=fail (2048-bit key) reason="fail (message has been altered)"
+        header.d=gmail.com header.b=WiuysEuO
+X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0
+Received: from forward1-smtp.messagingengine.com (forward1-smtp.messagingengine.com [66.111.4.223])
+        by ext-mx-in003.mykolab.com (Postfix) with ESMTPS id 9C4BA2EB8
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 17:39:23 +0200 (CEST)
+Received: from mailredirect.nyi.internal (imap36.nyi.internal [10.202.2.86])
+        by mailforward.nyi.internal (Postfix) with ESMTP id 5138E1453
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 11:39:22 -0400 (EDT)
+Received: by mailredirect.nyi.internal (Postfix, from userid 501)
+        id 48C918E9B6; Thu, 17 Aug 2017 11:39:22 -0400 (EDT)
+Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
+         by sloti36d2t28 (Cyrus fastmail-fmjessie44745-15358-git-fastmail-15358) with LMTPA;
+         Thu, 17 Aug 2017 11:39:22 -0400
+X-Cyrus-Session-Id: sloti36d2t28-3156705-1502984362-2-3811956415179411272
+X-Sieve: CMU Sieve 3.0
+X-Spam-known-sender: no
+X-Orig-Spam-score: 0.0
+X-Spam-hits: BAYES_00 -1.9, HTML_MESSAGE 0.001, RCVD_IN_DNSWL_MED -2.3,
+  RP_MATCHES_RCVD -0.001, SPF_PASS -0.001, LANGUAGES en, BAYES_USED global,
+  SA_VERSION 3.4.0
+X-Spam-source: IP='46.4.96.248', Host='postbox.kde.org', Country='DE', FromHeader='org',
+  MailFrom='org'
+X-Spam-charsets: plain='us-ascii', html='us-ascii'
+X-Attached: signature.asc
+X-Resolved-to: chrigi_1@fastmail.fm
+X-Delivered-to: chrigi_1@fastmail.fm
+X-Mail-from: kde-community-bounces@kde.org
+Received: from mx3 ([10.202.2.202])
+  by compute1.internal (LMTPProxy); Thu, 17 Aug 2017 11:39:22 -0400
+Authentication-Results: mx3.messagingengine.com;
+    dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=WiuysEuO;
+    dkim=pass (1024-bit rsa key sha256) header.d=kde.org header.i=@kde.org header.b=rysq5aPx;
+    dmarc=none (p=none;has-list-id=yes) header.from=kde.org;
+    spf=pass smtp.mailfrom=kde-community-bounces@kde.org smtp.helo=postbox.kde.org;
+    x-google-dkim=fail (message has been altered; 2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=eS2FiZD3
+Received-SPF: pass
+    (kde.org: 46.4.96.248 is authorized to use 'kde-community-bounces@kde.org' in 'mfrom' identity (mechanism 'mx' matched))
+    receiver=mx3.messagingengine.com;
+    identity=mailfrom;
+    envelope-from="kde-community-bounces@kde.org";
+    helo=postbox.kde.org;
+    client-ip=46.4.96.248
+Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
+        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+        (No client certificate requested)
+        by mx3.messagingengine.com (Postfix) with ESMTPS
+        for <chrigi_1@fastmail.fm>; Thu, 17 Aug 2017 11:39:21 -0400 (EDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
+        t=1502984359; bh=g7hsgd71OQgeOpLvXEjz16cF2X/6f5pmr2ujAF633tY=;
+        h=From:Date:Subject:In-Reply-To:To:References:Reply-To:List-Id:
+         List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:
+         From;
+        b=rysq5aPxwhI8i+Fx0jQHMx7aHC9RRMfjzmZTplBHjuND6qLLgZgMg2Tqpwgp1PnTR
+         zbpE07c5O50AqjjN74AqtaWdN7xCtsPb1taF9XjBDScI3wVcmiRZ5d88Sp9YI8rAzy
+         cY5uS6QDZfPt/BmonQqnc0oKpuuIlSp78R482qck=
+X-Original-To: kde-community@kde.org
+X-Remote-Delivered-To: kde-community@localhost.kde.org
+Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
+ client-ip=2a00:1450:400c:c0c::22a; helo=mail-wr0-x22a.google.com;
+ envelope-from=mirko.mb.boehm@gmail.com; receiver=kde-community@kde.org 
+Authentication-Results: postbox.kde.org; dkim=pass
+ reason="2048-bit key; unprotected key"
+ header.d=gmail.com header.i=@gmail.com header.b=WiuysEuO;
+ dkim-adsp=pass; dkim-atps=neutral
+Received: from mail-wr0-x22a.google.com (mail-wr0-x22a.google.com
+ [IPv6:2a00:1450:400c:c0c::22a])
+ by postbox.kde.org (Postfix) with ESMTPS id 6622AA028C;
+ Thu, 17 Aug 2017 15:38:56 +0000 (UTC)
+Received: by mail-wr0-x22a.google.com with SMTP id b65so47289023wrd.0;
+ Thu, 17 Aug 2017 08:38:56 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
+ h=sender:from:message-id:mime-version:date:subject:in-reply-to:to
+ :references; bh=yh4e0FfFAXMmAqoicYQa52CLKXFU6SJTKLd0PdPDxRM=;
+ b=WiuysEuO59GFkLy+fKRSFayTM8LXWK3dVaVHDKfsw/XM8YKcLalwNWGVU0tsaDl+7P
+ r5MMLidc6O0gJKGftMdhWrjeFGY0aE5F5+2NKN1oEb2INbB/DrS9KaCVy1SWvHVu8zOo
+ t13omoGW6RIs5lgWrTLR1iwcwtfkWwO/+Ndy16U3/eYJSXeUPWHsVSXP0UgIS6IANt58
+ lNQhTgWBAJNViCxH/p5nIZYvLY5tGJPL6J46GaM7jUK4Ev6HUx4pUwGBsPB4hBezPm7h
+ mzA74izFW7jE6JklTciMAb0q7wEG15exVQbTEG54nvWMASrWx6mMAc+CWLh/T8vokpvT
+ Kvrw==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20161025;
+ h=x-gm-message-state:sender:from:message-id:mime-version:date:subject
+ :in-reply-to:to:references;
+ bh=yh4e0FfFAXMmAqoicYQa52CLKXFU6SJTKLd0PdPDxRM=;
+ b=eS2FiZD3QQ7P0mT2qKkYWf91vVTGXnIHKKzNdIJq+8JXN8WoXQ8IXmvQqSQFJa/w16
+ m9I0Yko7iv/JDAa7YTeJraBfImv9weknM3zpUNan8SltCFNXO8f4yylP1rGLn0RWbQ3Q
+ 9NEpmYbS5dYQ79PMwy3zHxZEkUbsIFk8OlVSohdzpzGgtyU6nOjnBDULL14uHnouaz8+
+ TDss7L/vKlmrWOYdH+R8peCkFI6p3C69wpAEyNPGBaGyCRC+pebx6GGDBR63DFnyP464
+ VFQCUS4hPPTFaBPriqOF6xcWToacU40DVy3s2S/3EwHpUGWi+WMqQpPgqZYJh81unCDH
+ Hc7g==
+X-Gm-Message-State: AHYfb5hHmIopTFINsSS7+92/GpIh2jJhvpwp/cI1ajaDE2GLp/oZ6V7N
+ CCtnx8PQ3oXGOEKCRT4=
+X-Received: by 10.80.212.133 with SMTP id s5mr2195642edi.95.1502984335423;
+ Thu, 17 Aug 2017 08:38:55 -0700 (PDT)
+Received: from ?IPv6:2a02:8109:a4bf:e114:30bf:9873:2660:a4a8?
+ ([2a02:8109:a4bf:e114:30bf:9873:2660:a4a8])
+ by smtp.gmail.com with ESMTPSA id r29sm1790792edi.85.2017.08.17.08.38.52
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
+ Thu, 17 Aug 2017 08:38:52 -0700 (PDT)
+From: Mirko Boehm - KDE <mirko@kde.org>
+Message-Id: <B95D7D2A-23A9-4245-AAC0-8A3FAE330090@kde.org>
+Content-Type: multipart/signed;
+ boundary="Apple-Mail=_1637D59B-BBA3-401E-A7A5-3514665481AD";
+ protocol="application/pgp-signature"; micalg=pgp-sha1
+Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
+Date: Thu, 17 Aug 2017 17:38:52 +0200
+Subject: Re: Telemetry Policy
+In-Reply-To: <5231282.Ch11jfsTMl@lenovo>
+To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+References: <2048912.XfIJe3ZSdj@vkpc5> <2990543.KVDkBByYO0@minixfox>
+ <CACpu024EH1OeDqwL94QK33eq4sCGjKjwedcQDR_PWjprBevzfg@mail.gmail.com>
+ <5231282.Ch11jfsTMl@lenovo>
+X-Mailer: Apple Mail (2.3273)
+X-BeenThere: kde-community@kde.org
+X-Mailman-Version: 2.1.16
+Precedence: list
+Reply-To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+List-Id: informing about and discussing non-technical community topics
+ <kde-community.kde.org>
+List-Unsubscribe: <https://mail.kde.org/mailman/options/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=unsubscribe>
+List-Archive: <http://mail.kde.org/pipermail/kde-community/>
+List-Post: <mailto:kde-community@kde.org>
+List-Help: <mailto:kde-community-request@kde.org?subject=help>
+List-Subscribe: <https://mail.kde.org/mailman/listinfo/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=subscribe>
+Errors-To: kde-community-bounces@kde.org
+Sender: "kde-community" <kde-community-bounces@kde.org>
+
+
+--Apple-Mail=_1637D59B-BBA3-401E-A7A5-3514665481AD
+Content-Type: multipart/alternative;
+        boundary="Apple-Mail=_F49D9C7A-5DFA-4D78-8758-C0DB8C98E040"
+
+
+--Apple-Mail=_F49D9C7A-5DFA-4D78-8758-C0DB8C98E040
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/plain;
+        charset=us-ascii
+
+Hi,
+
+> On 17. Aug 2017, at 01:46, Thomas Pfeiffer <thomas.pfeiffer@kde.org> =
+wrote:
+>=20
+> Hi Valorie,
+> Even if opt-out for some data is legally and even morally fine, it =
+does not
+> align with the values we communicate to our users:
+> Unlike Mozilla's Mission, our Vision mentions privacy explicitly, and =
+we're
+> striving to make privacy our USP.
+
+We seem to assume a contradiction between telemetry and privacy. I =
+believe this is a knee-jerk reaction. We can implement telemetry in a =
+way that privacy is not violated. In fact, I would say that it follows =
+from our vision that we should do this.
+
+Cheers,
+
+Mirko.
+--
+Mirko Boehm | mirko@kde.org | KDE e.V.
+FSFE Fellowship Representative, FSFE Team Germany
+Qt Certified Specialist and Trainer
+Request a meeting: https://doodle.com/mirkoboehm
+
+
+--Apple-Mail=_F49D9C7A-5DFA-4D78-8758-C0DB8C98E040
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/html;
+        charset=us-ascii
+
+<html><head><meta http-equiv=3D"Content-Type" content=3D"text/html =
+charset=3Dus-ascii"></head><body style=3D"word-wrap: break-word; =
+-webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" =
+class=3D"">Hi,&nbsp;<div class=3D""><br class=3D""><div><blockquote =
+type=3D"cite" class=3D""><div class=3D"">On 17. Aug 2017, at 01:46, =
+Thomas Pfeiffer &lt;<a href=3D"mailto:thomas.pfeiffer@kde.org" =
+class=3D"">thomas.pfeiffer@kde.org</a>&gt; wrote:</div><br =
+class=3D"Apple-interchange-newline"><div class=3D""><span =
+style=3D"font-family: Menlo-Regular; font-size: 11px; font-style: =
+normal; font-variant-caps: normal; font-weight: normal; letter-spacing: =
+normal; text-align: start; text-indent: 0px; text-transform: none; =
+white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; =
+float: none; display: inline !important;" class=3D"">Hi =
+Valorie,</span><br style=3D"font-family: Menlo-Regular; font-size: 11px; =
+font-style: normal; font-variant-caps: normal; font-weight: normal; =
+letter-spacing: normal; text-align: start; text-indent: 0px; =
+text-transform: none; white-space: normal; word-spacing: 0px; =
+-webkit-text-stroke-width: 0px;" class=3D""><span style=3D"font-family: =
+Menlo-Regular; font-size: 11px; font-style: normal; font-variant-caps: =
+normal; font-weight: normal; letter-spacing: normal; text-align: start; =
+text-indent: 0px; text-transform: none; white-space: normal; =
+word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: =
+inline !important;" class=3D"">Even if opt-out for some data is legally =
+and even morally fine, it does not<span =
+class=3D"Apple-converted-space">&nbsp;</span></span><br =
+style=3D"font-family: Menlo-Regular; font-size: 11px; font-style: =
+normal; font-variant-caps: normal; font-weight: normal; letter-spacing: =
+normal; text-align: start; text-indent: 0px; text-transform: none; =
+white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" =
+class=3D""><span style=3D"font-family: Menlo-Regular; font-size: 11px; =
+font-style: normal; font-variant-caps: normal; font-weight: normal; =
+letter-spacing: normal; text-align: start; text-indent: 0px; =
+text-transform: none; white-space: normal; word-spacing: 0px; =
+-webkit-text-stroke-width: 0px; float: none; display: inline =
+!important;" class=3D"">align with the values we communicate to our =
+users:</span><br style=3D"font-family: Menlo-Regular; font-size: 11px; =
+font-style: normal; font-variant-caps: normal; font-weight: normal; =
+letter-spacing: normal; text-align: start; text-indent: 0px; =
+text-transform: none; white-space: normal; word-spacing: 0px; =
+-webkit-text-stroke-width: 0px;" class=3D""><span style=3D"font-family: =
+Menlo-Regular; font-size: 11px; font-style: normal; font-variant-caps: =
+normal; font-weight: normal; letter-spacing: normal; text-align: start; =
+text-indent: 0px; text-transform: none; white-space: normal; =
+word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: =
+inline !important;" class=3D"">Unlike Mozilla's Mission, our Vision =
+mentions privacy explicitly, and we're<span =
+class=3D"Apple-converted-space">&nbsp;</span></span><br =
+style=3D"font-family: Menlo-Regular; font-size: 11px; font-style: =
+normal; font-variant-caps: normal; font-weight: normal; letter-spacing: =
+normal; text-align: start; text-indent: 0px; text-transform: none; =
+white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" =
+class=3D""><span style=3D"font-family: Menlo-Regular; font-size: 11px; =
+font-style: normal; font-variant-caps: normal; font-weight: normal; =
+letter-spacing: normal; text-align: start; text-indent: 0px; =
+text-transform: none; white-space: normal; word-spacing: 0px; =
+-webkit-text-stroke-width: 0px; float: none; display: inline =
+!important;" class=3D"">striving to make privacy our USP.</span><br =
+style=3D"font-family: Menlo-Regular; font-size: 11px; font-style: =
+normal; font-variant-caps: normal; font-weight: normal; letter-spacing: =
+normal; text-align: start; text-indent: 0px; text-transform: none; =
+white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px;" =
+class=3D""></div></blockquote><br class=3D""></div><div>We seem to =
+assume a contradiction between telemetry and privacy. I believe this is =
+a knee-jerk reaction. We can implement telemetry in a way that privacy =
+is not violated. In fact, I would say that it follows from our vision =
+that we should do this.</div><div><br =
+class=3D""></div><div>Cheers,</div><div><br =
+class=3D""></div><div>Mirko.</div><div class=3D"">
+<div style=3D"orphans: auto; text-align: start; text-indent: 0px; =
+widows: auto; word-wrap: break-word; -webkit-nbsp-mode: space; =
+-webkit-line-break: after-white-space;" class=3D""><div style=3D"color: =
+rgb(0, 0, 0); letter-spacing: normal; text-transform: none; white-space: =
+normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; orphans: =
+auto; text-align: start; text-indent: 0px; widows: auto; word-wrap: =
+break-word; -webkit-nbsp-mode: space; -webkit-line-break: =
+after-white-space;" class=3D"">--&nbsp;<br class=3D""></div><div =
+style=3D"orphans: auto; text-align: start; text-indent: 0px; widows: =
+auto; word-wrap: break-word; -webkit-nbsp-mode: space; =
+-webkit-line-break: after-white-space;" class=3D"">Mirko Boehm | <a =
+href=3D"mailto:mirko@kde.org" class=3D"">mirko@kde.org</a> | KDE e.V.<br =
+class=3D"">FSFE Fellowship Representative, FSFE Team Germany<br =
+class=3D"">Qt Certified Specialist and Trainer<br class=3D"">Request a =
+meeting: <a href=3D"https://doodle.com/mirkoboehm" =
+class=3D"">https://doodle.com/mirkoboehm</a><br class=3D""></div></div>
+</div>
+
+<br class=3D""></div></body></html>=
+
+--Apple-Mail=_F49D9C7A-5DFA-4D78-8758-C0DB8C98E040--
+
+--Apple-Mail=_1637D59B-BBA3-401E-A7A5-3514665481AD
+Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment;
+        filename=signature.asc
+Content-Type: application/pgp-signature;
+        name=signature.asc
+Content-Description: Message signed with OpenPGP
+
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - http://gpgtools.org
+
+iEYEARECAAYFAlmVuIwACgkQYSSaITCTnKX82QCgxjyaXNsffHG/42ioAQrxjdCN
+D4kAn2Vv0q16buzjcRel1P144tLyqbr+
+=muZP
+-----END PGP SIGNATURE-----
+
+--Apple-Mail=_1637D59B-BBA3-401E-A7A5-3514665481AD--