auto delete from queue works on logout
Merge branch 'queue'