Thanks to Van Daele Bruno for reporting and correcting an error that 
prevented my patch from being used on many systems.

Thanks to Mario Chisari for reporting his success in using this patch
on courier 0.39.3 with minor changes and for reporting some errors
in the documentation.
