(bug 5292) Refactor ESN Reply migration code
(bug 5292) Add comment
Merge pull request #635 from anall/feature/bug5292

(bug 5292) Refactor ESN Reply migration code