Better address handling in import; convert reply notes to comments
Remove duplicate code to trim replies on create