diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml
index 17091f6b0..1846abde1 100644
--- a/app/views/shared/_right_sections.html.haml
+++ b/app/views/shared/_right_sections.html.haml
@@ -40,9 +40,9 @@
     %br
     %br
     %p
-      != t('aspects.index.help.tutorials_wiki_and_forum', :tutorial => link_to("Diasporial" , "http://diasporial.com/tutorials", :target => '_blank'), :wiki => link_to('Wiki','http://wiki.diasporafoundation.org', :target => '_blank'), :forum => link_to("Forum", "http://www.diasporaforum.org/", :target => '_blank'))
-    %p
-      != t('aspects.index.help.email_feedback', :link => link_to(t('aspects.index.help.email_link'), "mailto:feedback@joindiaspora.com"))
+      != t('aspects.index.help.tutorials_and_wiki',
+           :tutorial => link_to(t('aspects.index.help.tutorial_link_text'), "https://diasporafoundation.org/getting_started", :target => '_blank'),
+           :wiki => link_to('Wiki','http://wiki.diasporafoundation.org', :target => '_blank'), :target => '_blank')
 
 - unless AppConfig.configured_services.blank? || all_services_connected?
   .section
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 009ef6228..aaa456864 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -238,7 +238,8 @@ en:
         tag_bug: "bug"
         feature_suggestion: "... have a %{link} suggestion?"
         tag_feature: "feature"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
+        tutorials_and_wiki: "%{tutorial} & %{wiki}: Help for your first steps."
+        tutorial_link_text: "Tutorials"
         email_feedback: "%{link} your feedback, if you prefer"
         email_link: "Email"
         any_problem: "Any Problem?"