Might fix #7072

Conflicts:
	civicrm/custom/php/CRM/IMAP/AJAX.php