harden fetch_messages