Double Opt-in Bugfix
Tagging RC3
Merge branch 'hotfix-DoubleOptIn'

Conflicts:
	helper.php
	mod_freshmail2.xml