Fix for mail To: field
Add support for SQLite