Handling no messages on inbox and better UI for query