diff --git a/lib/ExpensiMark.js b/lib/ExpensiMark.js
index 45d7a9df..2d0e0a28 100644
--- a/lib/ExpensiMark.js
+++ b/lib/ExpensiMark.js
@@ -177,7 +177,7 @@ export default class ExpensiMark {
             {
                 name: 'reportMentions',
 
-                regex: /(?<![^ \n*~_])(#[\p{Ll}0-9-]{1,80})/gmiu,
+                regex: /(?<![^ \n*~_])(#[\p{Ll}0-9-]{1,80})/gimu,
                 replacement: '<mention-report>$1</mention-report>',
             },
 
@@ -421,7 +421,7 @@ export default class ExpensiMark {
             {
                 name: 'quote',
                 regex: /<(blockquote|q)(?:"[^"]*"|'[^']*'|[^'">])*>([\s\S]*?)<\/\1>(?![^<]*(<\/pre>|<\/code>))/gi,
-                replacement: (match, g1, g2) => {
+                replacement(match) {
                     // We remove the line break before heading inside quote to avoid adding extra line
                     let resultString = match
                         .replace(/\n?(<h1># )/g, '$1')
@@ -429,21 +429,22 @@ export default class ExpensiMark {
                         .trim()
                         .split('\n');
 
-                    resultString = _.map(resultString, (m) => {
+                    function processString(m) {
                         // Recursive function to replace nested <blockquote> with ">"
                         function replaceBlockquotes(text) {
-                            while (/<blockquote>/i.test(text)) {                             
-                                // Count how many <blockquote> tags
-                                let depth = (text.match(/<blockquote>/gi) || []).length;
-                                // Replace all blockquote tags and add ">" per depth level
-                                text = text.replace(/<blockquote>/gi, '');
-                                text = text.replace(/<\/blockquote>/gi, '');
-                                return `${'>'.repeat(depth)} ${text}`;
-                            }                          
-                            return text;
-                        }                   
+                            let modifiedText = text;
+                            let depth;
+                            do {
+                                depth = (modifiedText.match(/<blockquote>/gi) || []).length;
+                                modifiedText = modifiedText.replace(/<blockquote>/gi, '');
+                                modifiedText = modifiedText.replace(/<\/blockquote>/gi, '');
+                            } while (/<blockquote>/i.test(modifiedText));
+                            return `${'>'.repeat(depth)} ${modifiedText}`;
+                        }
                         return replaceBlockquotes(m);
-                    }).join('\n');            
+                    }
+
+                    resultString = _.map(resultString, processString).join('\n');
 
                     // We want to keep <blockquote> tag here and let method replaceBlockElementWithNewLine to handle the line break later
                     return `<blockquote>${resultString}</blockquote>`;