Handle direct messages more cleanly