Merge "Made message body duplicate detection customizable"