diff --git a/app/javascript/mastodon/features/circles/index.js b/app/javascript/mastodon/features/circles/index.js
index c5afdb356..2c1329f3d 100644
--- a/app/javascript/mastodon/features/circles/index.js
+++ b/app/javascript/mastodon/features/circles/index.js
@@ -48,7 +48,7 @@ class Circles extends ImmutablePureComponent {
   }
 
   render () {
-    const { intl, shouldUpdateScroll, circles, multiColumn } = this.props;
+    const { intl, circles, multiColumn } = this.props;
 
     if (!circles) {
       return (
@@ -68,7 +68,6 @@ class Circles extends ImmutablePureComponent {
 
         <ScrollableList
           scrollKey='circles'
-          shouldUpdateScroll={shouldUpdateScroll}
           emptyMessage={emptyMessage}
           prepend={<ColumnSubheading text={intl.formatMessage(messages.subheading)} />}
           bindToDocument={!multiColumn}
diff --git a/app/javascript/mastodon/features/mentions/index.js b/app/javascript/mastodon/features/mentions/index.js
index 3f44b1471..d30cac022 100644
--- a/app/javascript/mastodon/features/mentions/index.js
+++ b/app/javascript/mastodon/features/mentions/index.js
@@ -22,7 +22,6 @@ class Mentions extends ImmutablePureComponent {
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
-    shouldUpdateScroll: PropTypes.func,
     accountIds: ImmutablePropTypes.list,
     multiColumn: PropTypes.bool,
     intl: PropTypes.object.isRequired,
@@ -41,7 +40,7 @@ class Mentions extends ImmutablePureComponent {
   }
 
   render () {
-    const { shouldUpdateScroll, accountIds, multiColumn } = this.props;
+    const { accountIds, multiColumn } = this.props;
 
     if (!accountIds) {
       return (
@@ -62,7 +61,6 @@ class Mentions extends ImmutablePureComponent {
 
         <ScrollableList
           scrollKey='mentions'
-          shouldUpdateScroll={shouldUpdateScroll}
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
         >
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 3b4f666bd..e4e2107f9 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -360,8 +360,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
     return conversation if @object['context'].nil?
 
-    uri            = value_or_id(@object['context'])
-    conversation ||= ActivityPub::TagManager.instance.uri_to_resource(uri, Conversation)
+    uri                  = value_or_id(@object['context'])
+    context_conversation = ActivityPub::TagManager.instance.uri_to_resource(uri, Conversation)
+    conversation       ||= context_conversation
 
     return conversation if (conversation.present? && (conversation.local? || conversation.uri == uri)) || !uri.start_with?('https://')
 
@@ -375,6 +376,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
     return conversation if conversation_json.blank?
 
+    conversation = context_conversation if context_conversation.present?
     conversation ||= Conversation.new
     conversation.uri = uri
     conversation.inbox_url = conversation_json['inbox']