[geary: 5/5] Merge branch 'mjog/934-gmail-duplicate-messages' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 0972438a894caa0d5b6c078139da01e042cd94f0
Merge: 3fcd0f8af 3ddce7484
Author: Michael Gratton <mike vee net>
Date:   Sun Aug 23 03:25:34 2020 +0000

    Merge branch 'mjog/934-gmail-duplicate-messages' into 'mainline'
    
    Fix duplicate messages appearing in conversations
    
    Closes #934
    
    See merge request GNOME/geary!555

 sql/version-028.sql                              |  6 ++
 src/engine/imap-db/imap-db-folder.vala           |  5 +-
 src/engine/rfc822/rfc822-message-data.vala       | 49 ++++++++++++----
 test/engine/imap-db/imap-db-database-test.vala   |  2 +-
 test/engine/rfc822/rfc822-message-data-test.vala | 74 +++++++++++++++++++++++-
 5 files changed, 122 insertions(+), 14 deletions(-)
---