diff --git a/CHANGELOG.md b/CHANGELOG.md
index e937291b4..d9c3e1de2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,15 @@ Group changes to describe their impact on the project, as follows:
 - Replaced voice recordings file name by localized placeholder text, like for video conferences invitations
 - Removed jetifier as it is not needed
 
+## [5.0.8] - 2023-03-20
+
+### Fixed
+- Trying to prevent crash in call history
+- Color icon in dark mode in chat for files & replies
+
+### Changed
+- Updated translations
+
 ## [5.0.7] - 2023-02-27
 
 ### Fixed
diff --git a/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
index 4be3d79ae..254843e25 100644
--- a/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
@@ -145,7 +145,7 @@ private class CallLogDiffCallback : DiffUtil.ItemCallback<GroupedCallLogData>()
         oldItem: GroupedCallLogData,
         newItem: GroupedCallLogData
     ): Boolean {
-        return oldItem.lastCallLog.callId == newItem.lastCallLog.callId
+        return oldItem.lastCallLogId == newItem.lastCallLogId
     }
 
     override fun areContentsTheSame(
diff --git a/app/src/main/java/org/linphone/activities/main/history/data/GroupedCallLogData.kt b/app/src/main/java/org/linphone/activities/main/history/data/GroupedCallLogData.kt
index 522f759ec..81aece431 100644
--- a/app/src/main/java/org/linphone/activities/main/history/data/GroupedCallLogData.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/data/GroupedCallLogData.kt
@@ -23,8 +23,10 @@ import org.linphone.activities.main.history.viewmodels.CallLogViewModel
 import org.linphone.core.CallLog
 
 class GroupedCallLogData(callLog: CallLog) {
-    var lastCallLog: CallLog = callLog
     val callLogs = arrayListOf(callLog)
+
+    var lastCallLog: CallLog = callLog
+    var lastCallLogId: String? = callLog.callId
     val lastCallLogViewModel: CallLogViewModel
         get() {
             if (::_lastCallLogViewModel.isInitialized) {
@@ -41,4 +43,9 @@ class GroupedCallLogData(callLog: CallLog) {
             lastCallLogViewModel
         }
     }
+
+    fun updateLastCallLog(callLog: CallLog) {
+        lastCallLog = callLog
+        lastCallLogId = callLog.callId
+    }
 }
diff --git a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
index 67c04e2fb..0e4693589 100644
--- a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
@@ -160,7 +160,7 @@ class MasterCallLogsFragment : MasterFragment<HistoryMasterFragmentBinding, Call
                             val deletedCallGroup = adapter.currentList[index]
                             listViewModel.deleteCallLogGroup(deletedCallGroup)
                             if (!binding.slidingPane.isSlideable &&
-                                deletedCallGroup.lastCallLog.callId == sharedViewModel.selectedCallLogGroup.value?.lastCallLog?.callId
+                                deletedCallGroup.lastCallLogId == sharedViewModel.selectedCallLogGroup.value?.lastCallLogId
                             ) {
                                 Log.i("[History] Currently displayed history has been deleted, removing detail fragment")
                                 clearDisplayedCallHistory()
@@ -282,7 +282,7 @@ class MasterCallLogsFragment : MasterFragment<HistoryMasterFragmentBinding, Call
             val callLogGroup = adapter.currentList[index]
             list.add(callLogGroup)
 
-            if (callLogGroup.lastCallLog.callId == sharedViewModel.selectedCallLogGroup.value?.lastCallLog?.callId) {
+            if (callLogGroup.lastCallLogId == sharedViewModel.selectedCallLogGroup.value?.lastCallLogId) {
                 closeSlidingPane = true
             }
         }
diff --git a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogsListViewModel.kt b/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogsListViewModel.kt
index 081e8e1a7..0d63a47f7 100644
--- a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogsListViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogsListViewModel.kt
@@ -127,7 +127,7 @@ class CallLogsListViewModel : ViewModel() {
                         )
                     ) {
                         previousCallLogGroup.callLogs.add(callLog)
-                        previousCallLogGroup.lastCallLog = callLog
+                        previousCallLogGroup.updateLastCallLog(callLog)
                     } else {
                         list.add(previousCallLogGroup)
                         previousCallLogGroup = GroupedCallLogData(callLog)