Better address handling in import; convert reply notes to comments
Remove duplicate code to trim replies on create
Merge remote-tracking branch 'upstream/master'