diff --git a/shared/common-adapters/markdown/index.stories.js b/shared/common-adapters/markdown/index.stories.js
index aa68b393444e..c4741707555a 100644
--- a/shared/common-adapters/markdown/index.stories.js
+++ b/shared/common-adapters/markdown/index.stories.js
@@ -102,6 +102,7 @@ something unrelated
 
 > Separate paragraph
 `,
+  'Quotes super nested': `> > > > > > > > > foo bar`,
   'Quotes 3': `> _foo_ and *bar*! \`\`\`
 a = 1
 \`\`\`
diff --git a/shared/common-adapters/markdown/shared.js b/shared/common-adapters/markdown/shared.js
index a7ec48ab43df..41e470ffde8e 100644
--- a/shared/common-adapters/markdown/shared.js
+++ b/shared/common-adapters/markdown/shared.js
@@ -278,11 +278,17 @@ const rules = {
     // e.g. https://regex101.com/r/ZiDBsO/8
     parse: (capture, parse, state) => {
       const content = capture[0].replace(/^ *> */gm, '')
+      const blockQuoteRecursionLevel = state.blockQuoteRecursionLevel || 0
+      const nextState = {...state, blockQuoteRecursionLevel: blockQuoteRecursionLevel + 1}
+
       return {
-        content: parse(content, state),
+        content: parse(content, nextState),
       }
     },
     match: (source, state, lookbehind) => {
+      if (state.blockQuoteRecursionLevel > 6) {
+        return null
+      }
       const regex = /^( *>(?:[^\n](?!```))+\n?)+/
       // make sure the look behind is empty
       const emptyLookbehind = /^$|\n *$/
@@ -426,7 +432,7 @@ class SimpleMarkdownComponent extends PureComponent<MarkdownProps, {hasError: bo
   render() {
     if (this.state.hasError) {
       return (
-        <Text type="Body" style={styles.rootWrapper}>
+        <Text type="Body" style={Styles.collapseStyles([styles.rootWrapper, markdownStyles.wrapStyle])}>
           {this.props.children || ''}
         </Text>
       )
@@ -452,7 +458,7 @@ class SimpleMarkdownComponent extends PureComponent<MarkdownProps, {hasError: bo
       logger.error('Error parsing markdown')
       logger.debug('Error parsing markdown', e)
       return (
-        <Text type="Body" style={styles.rootWrapper}>
+        <Text type="Body" style={Styles.collapseStyles([styles.rootWrapper, markdownStyles.wrapStyle])}>
           {this.props.children || ''}
         </Text>
       )
diff --git a/shared/stories/__tests__/__snapshots__/Storyshots.test.js.snap b/shared/stories/__tests__/__snapshots__/Storyshots.test.js.snap
index fafe4b23e353..6183dd6b2e1a 100644
--- a/shared/stories/__tests__/__snapshots__/Storyshots.test.js.snap
+++ b/shared/stories/__tests__/__snapshots__/Storyshots.test.js.snap
@@ -145122,6 +145122,669 @@ Array [
 ]
 `;
 
+exports[`Storyshots Common/Markdown Quotes super nested[comparison] 1`] = `
+Array [
+  <div
+    style={
+      Object {
+        "height": "100%",
+        "width": "100%",
+      }
+    }
+  >
+    <div
+      style={
+        Object {
+          "height": "100%",
+          "overflow": "auto",
+          "width": "100%",
+        }
+      }
+    >
+      <div>
+        <div
+          className="box2_horizontal box2_centered"
+        >
+          <span
+            className="text_Body"
+            style={
+              Object {
+                "flex": 1,
+                "whiteSpace": "pre",
+              }
+            }
+          >
+            <div
+              style={
+                Object {
+                  "borderLeftColor": "#e6e6e6",
+                  "borderLeftWidth": 3,
+                  "borderStyle": "solid",
+                  "display": "block",
+                  "paddingLeft": 16,
+                }
+              }
+            >
+              <div
+                style={
+                  Object {
+                    "borderLeftColor": "#e6e6e6",
+                    "borderLeftWidth": 3,
+                    "borderStyle": "solid",
+                    "display": "block",
+                    "paddingLeft": 16,
+                  }
+                }
+              >
+                <div
+                  style={
+                    Object {
+                      "borderLeftColor": "#e6e6e6",
+                      "borderLeftWidth": 3,
+                      "borderStyle": "solid",
+                      "display": "block",
+                      "paddingLeft": 16,
+                    }
+                  }
+                >
+                  <div
+                    style={
+                      Object {
+                        "borderLeftColor": "#e6e6e6",
+                        "borderLeftWidth": 3,
+                        "borderStyle": "solid",
+                        "display": "block",
+                        "paddingLeft": 16,
+                      }
+                    }
+                  >
+                    <div
+                      style={
+                        Object {
+                          "borderLeftColor": "#e6e6e6",
+                          "borderLeftWidth": 3,
+                          "borderStyle": "solid",
+                          "display": "block",
+                          "paddingLeft": 16,
+                        }
+                      }
+                    >
+                      <div
+                        style={
+                          Object {
+                            "borderLeftColor": "#e6e6e6",
+                            "borderLeftWidth": 3,
+                            "borderStyle": "solid",
+                            "display": "block",
+                            "paddingLeft": 16,
+                          }
+                        }
+                      >
+                        <div
+                          style={
+                            Object {
+                              "borderLeftColor": "#e6e6e6",
+                              "borderLeftWidth": 3,
+                              "borderStyle": "solid",
+                              "display": "block",
+                              "paddingLeft": 16,
+                            }
+                          }
+                        >
+                          <span
+                            className="text_Body"
+                            style={
+                              Object {
+                                "color": "inherit",
+                                "display": "block",
+                                "fontWeight": "inherit",
+                                "whiteSpace": "pre-wrap",
+                                "wordBreak": "break-word",
+                              }
+                            }
+                          >
+                            &gt; &gt; foo bar
+
+                          </span>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </span>
+          <span
+            className="text_Body"
+            style={
+              Object {
+                "flex": 1,
+                "whiteSpace": "pre",
+              }
+            }
+          >
+            <div>
+              <div
+                style={
+                  Object {
+                    "borderLeftColor": "#e6e6e6",
+                    "borderLeftWidth": 3,
+                    "borderStyle": "solid",
+                    "display": "block",
+                    "paddingLeft": 16,
+                  }
+                }
+              >
+                <span
+                  className="text_Body"
+                  style={
+                    Object {
+                      "color": "inherit",
+                      "display": "block",
+                      "fontWeight": "inherit",
+                      "whiteSpace": "pre-wrap",
+                      "wordBreak": "break-word",
+                    }
+                  }
+                >
+                  &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; foo bar
+                </span>
+              </div>
+            </div>
+          </span>
+        </div>
+        <div
+          pointerEvents="box-none"
+          style={
+            Object {
+              "position": "absolute",
+            }
+          }
+        />
+      </div>
+    </div>
+    <div
+      id="modal-root"
+    />
+  </div>,
+  <div
+    pointerEvents="box-none"
+    style={
+      Object {
+        "position": "absolute",
+      }
+    }
+  />,
+]
+`;
+
+exports[`Storyshots Common/Markdown Quotes super nested[o] 1`] = `
+Array [
+  <div
+    style={
+      Object {
+        "height": "100%",
+        "width": "100%",
+      }
+    }
+  >
+    <div
+      style={
+        Object {
+          "height": "100%",
+          "overflow": "auto",
+          "width": "100%",
+        }
+      }
+    >
+      <div>
+        <div
+          className="box2_vertical box2_centered"
+        >
+          <span
+            className="text_Body"
+            style={
+              Object {
+                "whiteSpace": "pre",
+              }
+            }
+          >
+            <div>
+              <div
+                style={
+                  Object {
+                    "borderLeftColor": "#e6e6e6",
+                    "borderLeftWidth": 3,
+                    "borderStyle": "solid",
+                    "display": "block",
+                    "paddingLeft": 16,
+                  }
+                }
+              >
+                <span
+                  className="text_Body"
+                  style={
+                    Object {
+                      "color": "inherit",
+                      "display": "block",
+                      "fontWeight": "inherit",
+                      "whiteSpace": "pre-wrap",
+                      "wordBreak": "break-word",
+                    }
+                  }
+                >
+                  &gt; &gt; &gt; &gt; &gt; &gt; &gt; &gt; foo bar
+                </span>
+              </div>
+            </div>
+          </span>
+          <div
+            className="box2_vertical box2_centered"
+          >
+            <div
+              onClick={[Function]}
+              onMouseDown={[Function]}
+              onMouseUp={[Function]}
+              style={
+                Object {
+                  "alignItems": "center",
+                  "alignSelf": "center",
+                  "backgroundColor": "#4C8EFF",
+                  "borderRadius": 4,
+                  "cursor": "pointer",
+                  "display": "inline-block",
+                  "flexDirection": "column",
+                  "height": 32,
+                  "justifyContent": "center",
+                  "lineHeight": "inherit",
+                  "minWidth": undefined,
+                  "paddingLeft": 24,
+                  "paddingRight": 24,
+                  "position": "relative",
+                  "textAlign": "left",
+                  "transform": "none",
+                  "transition": "none",
+                }
+              }
+            >
+              <div
+                style={
+                  Object {
+                    "alignItems": "center",
+                    "display": "flex",
+                    "flexDirection": "row",
+                    "height": "100%",
+                    "justifyContent": "center",
+                    "position": "relative",
+                  }
+                }
+              >
+                <span
+                  className="text_BodyBig"
+                  style={
+                    Object {
+                      "color": "#ffffff",
+                      "textAlign": "center",
+                      "whiteSpace": "pre",
+                    }
+                  }
+                >
+                  Show AST
+                </span>
+              </div>
+            </div>
+          </div>
+          <div
+            className="box2_vertical box2_centered"
+          >
+            <div
+              onClick={[Function]}
+              onMouseDown={[Function]}
+              onMouseUp={[Function]}
+              style={
+                Object {
+                  "alignItems": "center",
+                  "alignSelf": "center",
+                  "backgroundColor": "#4C8EFF",
+                  "borderRadius": 4,
+                  "cursor": "pointer",
+                  "display": "inline-block",
+                  "flexDirection": "column",
+                  "height": 32,
+                  "justifyContent": "center",
+                  "lineHeight": "inherit",
+                  "minWidth": undefined,
+                  "paddingLeft": 24,
+                  "paddingRight": 24,
+                  "position": "relative",
+                  "textAlign": "left",
+                  "transform": "none",
+                  "transition": "none",
+                }
+              }
+            >
+              <div
+                style={
+                  Object {
+                    "alignItems": "center",
+                    "display": "flex",
+                    "flexDirection": "row",
+                    "height": "100%",
+                    "justifyContent": "center",
+                    "position": "relative",
+                  }
+                }
+              >
+                <span
+                  className="text_BodyBig"
+                  style={
+                    Object {
+                      "color": "#ffffff",
+                      "textAlign": "center",
+                      "whiteSpace": "pre",
+                    }
+                  }
+                >
+                  Show Preview
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          pointerEvents="box-none"
+          style={
+            Object {
+              "position": "absolute",
+            }
+          }
+        />
+      </div>
+    </div>
+    <div
+      id="modal-root"
+    />
+  </div>,
+  <div
+    pointerEvents="box-none"
+    style={
+      Object {
+        "position": "absolute",
+      }
+    }
+  />,
+]
+`;
+
+exports[`Storyshots Common/Markdown Quotes super nested[s] 1`] = `
+Array [
+  <div
+    style={
+      Object {
+        "height": "100%",
+        "width": "100%",
+      }
+    }
+  >
+    <div
+      style={
+        Object {
+          "height": "100%",
+          "overflow": "auto",
+          "width": "100%",
+        }
+      }
+    >
+      <div>
+        <div
+          className="box2_vertical box2_centered"
+        >
+          <span
+            className="text_Body"
+            style={
+              Object {
+                "whiteSpace": "pre",
+              }
+            }
+          >
+            <div
+              style={
+                Object {
+                  "borderLeftColor": "#e6e6e6",
+                  "borderLeftWidth": 3,
+                  "borderStyle": "solid",
+                  "display": "block",
+                  "paddingLeft": 16,
+                }
+              }
+            >
+              <div
+                style={
+                  Object {
+                    "borderLeftColor": "#e6e6e6",
+                    "borderLeftWidth": 3,
+                    "borderStyle": "solid",
+                    "display": "block",
+                    "paddingLeft": 16,
+                  }
+                }
+              >
+                <div
+                  style={
+                    Object {
+                      "borderLeftColor": "#e6e6e6",
+                      "borderLeftWidth": 3,
+                      "borderStyle": "solid",
+                      "display": "block",
+                      "paddingLeft": 16,
+                    }
+                  }
+                >
+                  <div
+                    style={
+                      Object {
+                        "borderLeftColor": "#e6e6e6",
+                        "borderLeftWidth": 3,
+                        "borderStyle": "solid",
+                        "display": "block",
+                        "paddingLeft": 16,
+                      }
+                    }
+                  >
+                    <div
+                      style={
+                        Object {
+                          "borderLeftColor": "#e6e6e6",
+                          "borderLeftWidth": 3,
+                          "borderStyle": "solid",
+                          "display": "block",
+                          "paddingLeft": 16,
+                        }
+                      }
+                    >
+                      <div
+                        style={
+                          Object {
+                            "borderLeftColor": "#e6e6e6",
+                            "borderLeftWidth": 3,
+                            "borderStyle": "solid",
+                            "display": "block",
+                            "paddingLeft": 16,
+                          }
+                        }
+                      >
+                        <div
+                          style={
+                            Object {
+                              "borderLeftColor": "#e6e6e6",
+                              "borderLeftWidth": 3,
+                              "borderStyle": "solid",
+                              "display": "block",
+                              "paddingLeft": 16,
+                            }
+                          }
+                        >
+                          <span
+                            className="text_Body"
+                            style={
+                              Object {
+                                "color": "inherit",
+                                "display": "block",
+                                "fontWeight": "inherit",
+                                "whiteSpace": "pre-wrap",
+                                "wordBreak": "break-word",
+                              }
+                            }
+                          >
+                            &gt; &gt; foo bar
+
+                          </span>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </span>
+          <div
+            className="box2_vertical box2_centered"
+          >
+            <div
+              onClick={[Function]}
+              onMouseDown={[Function]}
+              onMouseUp={[Function]}
+              style={
+                Object {
+                  "alignItems": "center",
+                  "alignSelf": "center",
+                  "backgroundColor": "#4C8EFF",
+                  "borderRadius": 4,
+                  "cursor": "pointer",
+                  "display": "inline-block",
+                  "flexDirection": "column",
+                  "height": 32,
+                  "justifyContent": "center",
+                  "lineHeight": "inherit",
+                  "minWidth": undefined,
+                  "paddingLeft": 24,
+                  "paddingRight": 24,
+                  "position": "relative",
+                  "textAlign": "left",
+                  "transform": "none",
+                  "transition": "none",
+                }
+              }
+            >
+              <div
+                style={
+                  Object {
+                    "alignItems": "center",
+                    "display": "flex",
+                    "flexDirection": "row",
+                    "height": "100%",
+                    "justifyContent": "center",
+                    "position": "relative",
+                  }
+                }
+              >
+                <span
+                  className="text_BodyBig"
+                  style={
+                    Object {
+                      "color": "#ffffff",
+                      "textAlign": "center",
+                      "whiteSpace": "pre",
+                    }
+                  }
+                >
+                  Show AST
+                </span>
+              </div>
+            </div>
+          </div>
+          <div
+            className="box2_vertical box2_centered"
+          >
+            <div
+              onClick={[Function]}
+              onMouseDown={[Function]}
+              onMouseUp={[Function]}
+              style={
+                Object {
+                  "alignItems": "center",
+                  "alignSelf": "center",
+                  "backgroundColor": "#4C8EFF",
+                  "borderRadius": 4,
+                  "cursor": "pointer",
+                  "display": "inline-block",
+                  "flexDirection": "column",
+                  "height": 32,
+                  "justifyContent": "center",
+                  "lineHeight": "inherit",
+                  "minWidth": undefined,
+                  "paddingLeft": 24,
+                  "paddingRight": 24,
+                  "position": "relative",
+                  "textAlign": "left",
+                  "transform": "none",
+                  "transition": "none",
+                }
+              }
+            >
+              <div
+                style={
+                  Object {
+                    "alignItems": "center",
+                    "display": "flex",
+                    "flexDirection": "row",
+                    "height": "100%",
+                    "justifyContent": "center",
+                    "position": "relative",
+                  }
+                }
+              >
+                <span
+                  className="text_BodyBig"
+                  style={
+                    Object {
+                      "color": "#ffffff",
+                      "textAlign": "center",
+                      "whiteSpace": "pre",
+                    }
+                  }
+                >
+                  Show Preview
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          pointerEvents="box-none"
+          style={
+            Object {
+              "position": "absolute",
+            }
+          }
+        />
+      </div>
+    </div>
+    <div
+      id="modal-root"
+    />
+  </div>,
+  <div
+    pointerEvents="box-none"
+    style={
+      Object {
+        "position": "absolute",
+      }
+    }
+  />,
+]
+`;
+
 exports[`Storyshots Common/Markdown Quotes[comparison] 1`] = `
 Array [
   <div