diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b00a94cc..09b2ae66 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,7 +31,9 @@
 
         <activity android:name=".activities.MainActivity" />
 
-        <activity android:name=".activities.ThreadActivity" />
+        <activity
+            android:name=".activities.ThreadActivity"
+            android:parentActivityName=".activities.MainActivity" />
 
         <activity
             android:name=".activities.SettingsActivity"
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
index 0bb9944a..af15b9f7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -15,6 +15,7 @@ import com.simplemobiletools.smsmessenger.adapters.MessagesAdapter
 import com.simplemobiletools.smsmessenger.extensions.config
 import com.simplemobiletools.smsmessenger.extensions.getMessages
 import com.simplemobiletools.smsmessenger.helpers.THREAD_ID
+import com.simplemobiletools.smsmessenger.helpers.THREAD_NAME
 import com.simplemobiletools.smsmessenger.models.Message
 import kotlinx.android.synthetic.main.activity_main.*
 
@@ -78,6 +79,7 @@ class MainActivity : SimpleActivity() {
         MessagesAdapter(this, messages, messages_list, messages_fastscroller) {
             Intent(this, ThreadActivity::class.java).apply {
                 putExtra(THREAD_ID, (it as Message).thread)
+                putExtra(THREAD_NAME, it.address)
                 startActivity(this)
             }
         }.apply {
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index 38370d1d..c52c8b4c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -5,6 +5,7 @@ import com.simplemobiletools.smsmessenger.R
 import com.simplemobiletools.smsmessenger.adapters.ThreadAdapter
 import com.simplemobiletools.smsmessenger.extensions.getMessages
 import com.simplemobiletools.smsmessenger.helpers.THREAD_ID
+import com.simplemobiletools.smsmessenger.helpers.THREAD_NAME
 import kotlinx.android.synthetic.main.activity_thread.*
 
 class ThreadActivity : SimpleActivity() {
@@ -12,6 +13,8 @@ class ThreadActivity : SimpleActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_thread)
+        title = intent.getStringExtra(THREAD_NAME) ?: getString(R.string.app_launcher_name)
+
         val threadID = intent.getIntExtra(THREAD_ID, 0)
         val messages = getMessages(threadID)
         messages.sortBy { it.id }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
index f99845b3..129a9865 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt
@@ -1,3 +1,4 @@
 package com.simplemobiletools.smsmessenger.helpers
 
 const val THREAD_ID = "thread_id"
+const val THREAD_NAME = "thread_name"