[#160] This logic is better to determine which message to append