Oops, managed to commit a partial change regarding the POP3 client