Fix #5451 - add_message inconsistencies