Fix issue with edited messages (bidirectionally is back), thanks @eijebong @Arnaud