diff --git a/app/src/main/java/net/vonforst/evmap/auto/SettingsScreens.kt b/app/src/main/java/net/vonforst/evmap/auto/SettingsScreens.kt
index ca6181ce..e44fc5b6 100644
--- a/app/src/main/java/net/vonforst/evmap/auto/SettingsScreens.kt
+++ b/app/src/main/java/net/vonforst/evmap/auto/SettingsScreens.kt
@@ -863,13 +863,24 @@ class AboutScreen(ctx: CarContext) : Screen(ctx) {
             }.build(), carContext.getString(R.string.about)))
             addSectionedList(SectionedItemList.create(ItemList.Builder().apply {
                 addItem(Row.Builder()
-                    .setTitle(carContext.getString(R.string.twitter))
-                    .addText(carContext.getString(R.string.twitter_handle))
+                    .setTitle(carContext.getString(R.string.mastodon))
+                    .addText(carContext.getString(R.string.mastodon_handle))
                     .setBrowsable(true)
                     .setOnClickListener(ParkedOnlyOnClickListener.create {
-                        openUrl(carContext, carContext.getString(R.string.twitter_url))
+                        openUrl(carContext, carContext.getString(R.string.mastodon_url))
                     }).build()
                 )
+                if (maxRows > 8) {
+                    addItem(
+                        Row.Builder()
+                            .setTitle(carContext.getString(R.string.twitter))
+                            .addText(carContext.getString(R.string.twitter_handle))
+                            .setBrowsable(true)
+                            .setOnClickListener(ParkedOnlyOnClickListener.create {
+                                openUrl(carContext, carContext.getString(R.string.twitter_url))
+                            }).build()
+                    )
+                }
                 if (maxRows > 6) {
                     addItem(Row.Builder()
                         .setTitle(carContext.getString(R.string.goingelectric_forum))
@@ -882,6 +893,19 @@ class AboutScreen(ctx: CarContext) : Screen(ctx) {
                         }).build()
                     )
                 }
+                if (maxRows > 7) {
+                    addItem(
+                        Row.Builder()
+                            .setTitle(carContext.getString(R.string.tff_forum))
+                            .setBrowsable(true)
+                            .setOnClickListener(ParkedOnlyOnClickListener.create {
+                                openUrl(
+                                    carContext,
+                                    carContext.getString(R.string.tff_forum_url)
+                                )
+                            }).build()
+                    )
+                }
             }.build(), carContext.getString(R.string.contact)))
             addSectionedList(SectionedItemList.create(ItemList.Builder().apply {
                 addItem(Row.Builder()
diff --git a/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt
index c820c822..c25474c4 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt
@@ -118,6 +118,13 @@ class AboutFragment : PreferenceFragmentCompat() {
                 findNavController().safeNavigate(AboutFragmentDirections.actionAboutToGithubSponsors())
                 true
             }
+            "mastodon" -> {
+                (activity as? MapsActivity)?.openUrl(
+                    getString(R.string.mastodon_url),
+                    requireView()
+                )
+                true
+            }
             "twitter" -> {
                 (activity as? MapsActivity)?.openUrl(getString(R.string.twitter_url), requireView())
                 true
@@ -129,6 +136,13 @@ class AboutFragment : PreferenceFragmentCompat() {
                 )
                 true
             }
+            "tffforum" -> {
+                (activity as? MapsActivity)?.openUrl(
+                    getString(R.string.tff_forum_url),
+                    requireView()
+                )
+                true
+            }
             else -> super.onPreferenceTreeClick(preference)
         }
     }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 56a5e71b..4beff125 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -111,7 +111,9 @@
     <string name="and_n_others">und %d weitere</string>
     <string name="pref_map_provider">Kartenanbieter</string>
     <string name="twitter">Twitter</string>
+    <string name="mastodon">Mastodon</string>
     <string name="goingelectric_forum">Forenthread bei GoingElectric.de</string>
+    <string name="tff_forum">Forenthread im TFF-Forum</string>
     <string name="contact">Kontakt</string>
     <string name="menu_report_new_charger">Ladesäule melden</string>
     <string name="edit_at_datasource">Bei %s bearbeiten</string>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 96f76890..f48a01e3 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -5,7 +5,10 @@
     <string name="github_link">https://github.com/ev-map/EVMap</string>
     <string name="twitter_handle">\@ev_map</string>
     <string name="twitter_url">https://twitter.com/ev_map</string>
+    <string name="mastodon_handle">\@evmap\@electroverse.tech</string>
+    <string name="mastodon_url">https://electroverse.tech/@evmap</string>
     <string name="goingelectric_forum_url"><![CDATA[https://www.goingelectric.de/forum/viewtopic.php?f=5&t=56342]]></string>
+    <string name="tff_forum_url"><![CDATA[https://tff-forum.de/t/283834]]></string>
     <string name="github_sponsors_link">https://github.com/sponsors/johan12345/</string>
     <string name="chargeprice_api_url">https://api.chargeprice.app/v1/</string>
     <string name="fronyx_url">https://fronyx.io/</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 125141eb..ad02d3b4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -111,7 +111,9 @@
     <string name="and_n_others">and %d others</string>
     <string name="pref_map_provider">Map provider</string>
     <string name="twitter">Twitter</string>
+    <string name="mastodon">Mastodon</string>
     <string name="goingelectric_forum">Forum thread at GoingElectric.de</string>
+    <string name="tff_forum">Forum thread at TFF-Forum.de</string>
     <string name="contact">Contact</string>
     <string name="menu_report_new_charger">New charger</string>
     <string name="edit_at_datasource">Edit at %s</string>
diff --git a/app/src/main/res/xml/about.xml b/app/src/main/res/xml/about.xml
index 932e3a4b..f07270c1 100644
--- a/app/src/main/res/xml/about.xml
+++ b/app/src/main/res/xml/about.xml
@@ -39,6 +39,10 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/contact">
+        <Preference
+            android:key="mastodon"
+            android:title="@string/mastodon"
+            android:summary="@string/mastodon_handle" />
 
         <Preference
             android:key="twitter"
@@ -49,6 +53,10 @@
             android:key="goingelectric"
             android:title="@string/goingelectric_forum" />
 
+        <Preference
+            android:key="tffforum"
+            android:title="@string/tff_forum" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/other">