Changes needed for 3.20
 - More testing
 - Convert "termsmartmail" to C.
