Receiving of re-sent deleted messages (#7115)#7131

iequidoo wants to merge 2 commits intomainchatmail/core:mainfrom

iequidoo/one-shot-tombstoneschatmail/core:iequidoo/one-shot-tombstonesCopy head branch name to clipboard