diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7618c8c1c04782200d5aceb4f235454b4643b3fb..e1316b4d32589d7b54cbf7614aed597d0cb87b5a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -89,7 +89,7 @@
     <activity
       android:name=".ui.coresettings.networkserver.NetworkServerActivity"
       android:exported="false"
-      android:label="@string/settings_network_title"
+      android:label="@string/settings_networkserver_title"
       android:windowSoftInputMode="adjustResize" />
     <activity
       android:name=".ui.coresettings.identity.IdentityCreateActivity"
@@ -127,6 +127,12 @@
       android:label="@string/settings_ignoreitem_title"
       android:parentActivityName=".ui.coresettings.ignorelist.IgnoreListActivity"
       android:windowSoftInputMode="adjustResize" />
+    <activity
+      android:name=".ui.coresettings.highlightlist.HighlightListActivity"
+      android:exported="false"
+      android:label="@string/settings_highlightlist_title"
+      android:parentActivityName=".ui.coresettings.CoreSettingsActivity"
+      android:windowSoftInputMode="adjustResize" />
     <activity
       android:name=".ui.coresettings.networkconfig.NetworkConfigActivity"
       android:exported="false"
diff --git a/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt b/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt
index ae530d1c2043b81025f27c8a4de5c97e67badabe..89ff18ff4a93a16849e41143da00d0e9b905b0ed 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt
@@ -26,6 +26,8 @@ import de.kuschku.quasseldroid.ui.coresettings.chatlist.ChatlistCreateActivity
 import de.kuschku.quasseldroid.ui.coresettings.chatlist.ChatlistCreateFragmentProvider
 import de.kuschku.quasseldroid.ui.coresettings.chatlist.ChatlistEditActivity
 import de.kuschku.quasseldroid.ui.coresettings.chatlist.ChatlistEditFragmentProvider
+import de.kuschku.quasseldroid.ui.coresettings.highlightlist.HighlightListActivity
+import de.kuschku.quasseldroid.ui.coresettings.highlightlist.HighlightListFragmentProvider
 import de.kuschku.quasseldroid.ui.coresettings.identity.IdentityCreateActivity
 import de.kuschku.quasseldroid.ui.coresettings.identity.IdentityCreateFragmentProvider
 import de.kuschku.quasseldroid.ui.coresettings.identity.IdentityEditActivity
@@ -99,7 +101,10 @@ abstract class ActivityModule {
   abstract fun bindChatListEditActivity(): ChatlistEditActivity
 
   @ContributesAndroidInjector(modules = [IgnoreListFragmentProvider::class])
-  abstract fun bindIgnoreActivity(): IgnoreListActivity
+  abstract fun bindIgnoreListActivity(): IgnoreListActivity
+
+  @ContributesAndroidInjector(modules = [HighlightListFragmentProvider::class])
+  abstract fun bindHighlightListActivity(): HighlightListActivity
 
   @ContributesAndroidInjector(modules = [IgnoreItemFragmentProvider::class])
   abstract fun bindIgnoreItemActivity(): IgnoreItemActivity
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListActivity.kt
new file mode 100644
index 0000000000000000000000000000000000000000..cb731e56f7f8bb13215b01604defcc3c0ebdc2ec
--- /dev/null
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListActivity.kt
@@ -0,0 +1,12 @@
+package de.kuschku.quasseldroid.ui.coresettings.highlightlist
+
+import android.content.Context
+import android.content.Intent
+import de.kuschku.quasseldroid.util.ui.SettingsActivity
+
+class HighlightListActivity : SettingsActivity(HighlightListFragment()) {
+  companion object {
+    fun launch(context: Context) = context.startActivity(intent(context))
+    fun intent(context: Context) = Intent(context, HighlightListActivity::class.java)
+  }
+}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragment.kt
new file mode 100644
index 0000000000000000000000000000000000000000..8e2cf3a10fc0cbfe8edda5d3232b80d69aa4e181
--- /dev/null
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragment.kt
@@ -0,0 +1,23 @@
+package de.kuschku.quasseldroid.ui.coresettings.highlightlist
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import de.kuschku.quasseldroid.ui.coresettings.SettingsFragment
+
+class HighlightListFragment : SettingsFragment(), SettingsFragment.Savable,
+                              SettingsFragment.Changeable {
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                            savedInstanceState: Bundle?): View? {
+    return super.onCreateView(inflater, container, savedInstanceState)
+  }
+
+  override fun hasChanged(): Boolean {
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+  }
+
+  override fun onSave(): Boolean {
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+  }
+}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragmentProvider.kt
new file mode 100644
index 0000000000000000000000000000000000000000..49fa4cc3c906a8a9e3ccc6b6ec7aa1865c3c6d80
--- /dev/null
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragmentProvider.kt
@@ -0,0 +1,10 @@
+package de.kuschku.quasseldroid.ui.coresettings.highlightlist
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class HighlightListFragmentProvider {
+  @ContributesAndroidInjector
+  abstract fun bindHighlightListFragment(): HighlightListFragment
+}