Fix #3156430: Messages not Delivered (4th attempt)