diff --git a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
index 179fa0193..c2055a16e 100644
--- a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
+++ b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js
@@ -63,17 +63,18 @@ class DeleteMyAccount extends React.Component {
         <p className="talk-plugin-auth--delete-my-account-description">
           {t('delete_request.delete_my_account_description')}
         </p>
-        <p className="talk-plugin-auth--delete-my-account-description">
-          {scheduledDeletionDate &&
-            t(
-              'delete_request.already_submitted_request_description',
-              moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a')
-            )}
-        </p>
         {scheduledDeletionDate ? (
-          <Button onClick={this.cancelAccountDeletion}>
-            {t('delete_request.cancel_account_deletion_request')}
-          </Button>
+          <div>
+            <p className="talk-plugin-auth--delete-my-account-description">
+              {t(
+                'delete_request.already_submitted_request_description',
+                moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a')
+              )}
+            </p>
+            <Button onClick={this.cancelAccountDeletion}>
+              {t('delete_request.cancel_account_deletion_request')}
+            </Button>
+          </div>
         ) : (
           <Button icon="delete" onClick={this.showDialog}>
             {t('delete_request.delete_my_account')}
diff --git a/plugins/talk-plugin-rich-text/client/components/rte/components/Button.js b/plugins/talk-plugin-rich-text/client/components/rte/components/Button.js
index f99648cb7..fd5d451a1 100644
--- a/plugins/talk-plugin-rich-text/client/components/rte/components/Button.js
+++ b/plugins/talk-plugin-rich-text/client/components/rte/components/Button.js
@@ -7,21 +7,17 @@ class Button extends React.Component {
   render() {
     const {
       className,
-      title,
-      onClick,
       children,
       active,
       activeClassName,
-      disabled,
+      ...rest
     } = this.props;
     return (
       <button
         className={cn(className, styles.button, {
           [cn(styles.active, activeClassName)]: active,
         })}
-        title={title}
-        onClick={onClick}
-        disabled={disabled}
+        {...rest}
       >
         {children}
       </button>
@@ -32,11 +28,8 @@ class Button extends React.Component {
 Button.propTypes = {
   className: PropTypes.string,
   activeClassName: PropTypes.string,
-  title: PropTypes.string,
-  onClick: PropTypes.func,
   children: PropTypes.node,
   active: PropTypes.bool,
-  disabled: PropTypes.bool,
 };
 
 export default Button;
diff --git a/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js b/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js
index 028757222..59b75fdf2 100644
--- a/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js
+++ b/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Button from '../components/Button';
+import bowser from 'bowser';
 
 /**
  *  createToggle creates a button that can be active, inactive or disabled
@@ -32,7 +33,17 @@ const createToggle = (
       this.execCommand();
     };
 
+    // Detect whether there was focus on the RTE before the click.
+    hadFocusBeforeClick = false;
+    handleMouseDown = () => (this.hadFocusBeforeClick = this.props.api.focused);
+
     handleClick = () => {
+      // Skip IOS when the focus was not there before.
+      // IOS fails to focus to the RTE correctly and scrolls to nirvana.
+      // See https://www.pivotaltracker.com/story/show/157607216
+      if (!this.hadFocusBeforeClick && bowser.ios) {
+        return;
+      }
       this.props.api.focus();
       this.formatToggle();
       this.props.api.focus();
@@ -62,6 +73,7 @@ const createToggle = (
         <Button
           className={className}
           title={title}
+          onMouseDown={this.handleMouseDown}
           onClick={this.handleClick}
           active={this.state.active}
           disabled={disabled || this.state.disabled}
diff --git a/plugins/talk-plugin-rich-text/client/components/rte/lib/dom.js b/plugins/talk-plugin-rich-text/client/components/rte/lib/dom.js
index a5fbec19e..c82b13d59 100644
--- a/plugins/talk-plugin-rich-text/client/components/rte/lib/dom.js
+++ b/plugins/talk-plugin-rich-text/client/components/rte/lib/dom.js
@@ -381,9 +381,13 @@ export function isBogusBR(node) {
 }
 
 /**
- * Returns an array of all nodes after `node`.
+ * Returns an array of all nodes after `node` in a _line_.
  */
 export function getRightOfNode(node) {
+  if (node.tagName === 'BR') {
+    return [];
+  }
+
   let result = [];
   let cur = node;
   while (
@@ -515,10 +519,10 @@ export function outdentBlock(node, changeSelection) {
 
   // A new lines to substitute the missing block element.
   const needLineAfter =
-    node.nextSibling &&
-    !isBlockElement(node.nextSibling) &&
-    node.lastChild &&
-    !isBlockElement(node.lastChild);
+    !node.lastChild ||
+    (node.nextSibling &&
+      !isBlockElement(node.nextSibling) &&
+      !isBlockElement(node.lastChild));
   const needLineBefore =
     node.previousSibling &&
     !isBlockElement(node.previousSibling) &&