KAZOO-2894 - change the order of Message-Account and Messages-Waiting