This fixes replying to huddle messages. (imported from commit 8e6f9ce7d690c926b19c50016ec972d767428994)