4 files changed, 29 insertions, 27 deletions
diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index cd809566f..13c5ece4e 100644
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -3,7 +3,7 @@
 class InstancePresenter
   delegate(
     :closed_registrations_message,
-    :contact_email,
+    :site_contact_email,
     :open_registrations,
     :site_description,
     :site_extended_description,
diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml
new file mode 100644
index 000000000..d8c54c182
--- /dev/null
+++ b/app/views/about/_contact.html.haml
@@ -0,0 +1,15 @@
+.panel
+  .panel-header= t 'about.contact'
+  .panel-body
+    - if contact.contact_account
+      .owner
+        .avatar= image_tag contact.contact_account.avatar.url
+        .name
+          = link_to TagManager.instance.url_for(contact.contact_account) do
+            %span.display_name.emojify= display_name(contact.contact_account)
+            %span.username= "@#{contact.contact_account.acct}"
+
+    - if contact.site_contact_email
+      .contact-email
+        = t 'about.business_email'
+        %strong= contact.site_contact_email
diff --git a/app/views/about/_links.html.haml b/app/views/about/_links.html.haml
new file mode 100644
index 000000000..492c71320
--- /dev/null
+++ b/app/views/about/_links.html.haml
@@ -0,0 +1,11 @@
+.panel
+  .panel-header= t 'about.links'
+  .panel-list
+    %ul
+      - if user_signed_in?
+        %li= link_to t('about.get_started'), root_path
+      - else
+        %li= link_to t('about.get_started'), new_user_registration_path
+        %li= link_to t('auth.login'), new_user_session_path
+      %li= link_to t('about.terms'), terms_path
+      %li= link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml
index 8c12f57c1..418c98247 100644
--- a/app/views/about/more.html.haml
+++ b/app/views/about/more.html.haml
@@ -28,29 +28,5 @@
         .panel= @instance_presenter.site_extended_description.html_safe
 
     .sidebar
-      .panel
-        .panel-header= t 'about.contact'
-        .panel-body
-          - if @instance_presenter.contact_account
-            .owner
-              .avatar= image_tag @instance_presenter.contact_account.avatar.url
-              .name
-                = link_to TagManager.instance.url_for(@instance_presenter.contact_account) do
-                  %span.display_name.emojify= display_name(@instance_presenter.contact_account)
-                  %span.username= "@#{@instance_presenter.contact_account.acct}"
-
-          - unless @instance_presenter.contact_email.blank?
-            .contact-email
-              = t 'about.business_email'
-              %strong= @instance_presenter.contact_email
-      .panel
-        .panel-header= t 'about.links'
-        .panel-list
-          %ul
-            - if user_signed_in?
-              %li= link_to t('about.get_started'), root_path
-            - else
-              %li= link_to t('about.get_started'), new_user_registration_path
-              %li= link_to t('auth.login'), new_user_session_path
-            %li= link_to t('about.terms'), terms_path
-            %li= link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
+      = render partial: 'contact', object: @instance_presenter
+      = render 'links'