Merge "Fix auto-refresh of mailboxes."