improve & refactor quote reply
Merge pull request #767 from ZogStriP/refactor-quote-reply

improve & refactor quote reply