diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
index cf3925eab..f9f5f0147 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
@@ -384,7 +384,8 @@ class ConversationInfoActivity :
                     val concat1 = if (profile.role != null && profile.company != null) " @ " else ""
                     val role = profile.role ?: ""
                     val company = profile.company ?: ""
-                    binding.professionCompany.text = "$role$concat1$company"
+                    val professionCompanyText = "$role$concat1$company"
+                    binding.professionCompany.text = professionCompanyText
 
                     val profileZoneOffset = ZoneOffset.ofTotalSeconds(0)
                     val secondsToAdd = profile.timezoneOffset?.toLong() ?: 0
@@ -392,10 +393,11 @@ class ConversationInfoActivity :
                     val localTimeString = localTime.format(DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT))
                     val concat2 = if (profile.address != null) " · " else ""
                     val address = profile.address ?: ""
-                    binding.locationTime.text = "$localTimeString$concat2$address"
+                    val localTimeLocation = "$localTimeString$concat2$address"
+                    binding.locationTime.text = resources.getString(R.string.local_time, localTimeLocation)
 
                     binding.pronouns.visibility = VISIBLE
-                    binding.professionCompany.visibility = VISIBLE
+                    binding.professionCompany.visibility = if (professionCompanyText.isNotEmpty()) VISIBLE else GONE
                     binding.locationTime.visibility = VISIBLE
                 }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 00b2351c2..b8f31db2e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -847,4 +847,5 @@ How to translate with transifex:
     <string name="archived_conversation">Archived %1$s</string>
     <string name="unarchived_conversation">Unarchived %1$s</string>
     <string name="conversation_archived">Conversation is archived</string>
+    <string name="local_time">Local time: %1$s</string>
 </resources>