Now correctly displaying message queue on event end

fixes #310
fixes #312