diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Quote.js
index 96bebf8bcd..a417e9a6de 100644
--- a/src/components/views/elements/Quote.js
+++ b/src/components/views/elements/Quote.js
@@ -15,13 +15,31 @@ limitations under the License.
 */
 import React from 'react';
 import sdk from '../../../index';
+import {_t} from '../../../languageHandler';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixEvent} from 'matrix-js-sdk';
 
 // For URLs of matrix.to links in the timeline which have been reformatted by
 // HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
 const REGEX_LOCAL_MATRIXTO = /^#\/room\/(([\#\!])[^\/]*)\/(\$[^\/]*)$/;
 
+const MILLIS_IN_DAY = 86400000;
+function wantsDateSeparator(parentEvent, event) {
+    const parentEventDate = parentEvent.getDate();
+    const eventDate = event.getDate();
+    if (!eventDate || !parentEventDate) {
+        return false;
+    }
+    // Return early for events that are > 24h apart
+    if (Math.abs(parentEvent.getTs() - eventDate.getTime()) > MILLIS_IN_DAY) {
+        return true;
+    }
+
+    // Compare weekdays
+    return parentEventDate.getDay() !== eventDate.getDay();
+}
+
 const Quote = React.createClass({
     statics: {
         isMessageUrl: (url) => {
@@ -36,6 +54,8 @@ const Quote = React.createClass({
     props: {
         // The matrix.to url of the event
         url: PropTypes.string,
+        // The parent event
+        parentEv: PropTypes.instanceOf(MatrixEvent),
         // Whether to include an avatar in the pill
         shouldShowPillAvatar: PropTypes.bool,
     },
@@ -98,14 +118,21 @@ const Quote = React.createClass({
         const ev = this.state.event;
         if (ev) {
             const EventTile = sdk.getComponent('views.rooms.EventTile');
-            return <blockquote>
+            let dateSep = null;
+            if (wantsDateSeparator(this.props.parentEv, this.state.event)) {
+                const DateSeparator = sdk.getComponent('messages.DateSeparator');
+                dateSep = <a href={this.props.url}><DateSeparator ts={this.state.event.getDate()} /></a>;
+            }
+
+            return <blockquote className="mx_Quote">
+                { dateSep }
                 <EventTile mxEvent={ev} tileShape="quote" />
             </blockquote>;
         }
 
         // Deliberately render nothing if the URL isn't recognised
         return <div>
-            <a href={this.props.url}>Quote</a>
+            <a href={this.props.url}>{ _t('Quote') }</a>
             <br />
         </div>;
     },
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 4c41cbe669..adf79d3135 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -208,7 +208,8 @@ module.exports = React.createClass({
                     // only allow this branch if we're not already in a quote, as fun as infinite nesting is.
                     const quoteContainer = document.createElement('span');
 
-                    const quote = <Quote url={href} shouldShowPillAvatar={shouldShowPillAvatar} />;
+                    const quote =
+                        <Quote url={href} parentEv={this.props.mxEvent} shouldShowPillAvatar={shouldShowPillAvatar} />;
 
                     ReactDOM.render(quote, quoteContainer);
                     node.parentNode.replaceChild(quoteContainer, node);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index db9f1e35e1..908a203a42 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -940,5 +940,6 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
     "Import": "Import",
-    "Quoting": "Quoting"
+    "Quoting": "Quoting",
+    "Rich Quoting": "Rich Quoting"
 }