[SMS] [Edit Mode] Improve performance in edit-mode r=rnowm