Use p.a.controlpanel branch plip10359-mail-controlpanel