Conflicts: sql/version-010.sql src/client/folder-list/folder-list-folder-entry.vala src/engine/rfc822/rfc822-message.vala Also, I had to manually fix some compile errors introduced due to interfaces changing on master.
