redesign handling of current/new conversations