Rearrange removal of email reply original text to after html cleaning
Merge branch 'development' into livetest