Refined edit/reply logic and removed old editor