#17199 Fixing a git error (some code was erased)

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs/Naaya@20584 a0171fae-0946-0410-966d-b1775066cd26
released 3.3.25, new version 3.3.26

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs/Naaya@20586 a0171fae-0946-0410-966d-b1775066cd26
Updated some tests to work with new CC field in diverted_mail

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs/Naaya@20590 a0171fae-0946-0410-966d-b1775066cd26