diff --git a/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt
index 106756fe..b06b51fb 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt
@@ -92,22 +92,6 @@ class HistoryAdapter(onItemClickListener: OnItemClickListener, activity: Activit
             System.currentTimeMillis(),
             DateUtils.MINUTE_IN_MILLIS
         )
-//
-//        val time = item.time
-//        val downloadedTime: String
-//        if (time == 0L) {
-//            downloadedTime = activity.getString(R.string.currently_downloading) + " " + item.type
-//        } else {
-//            val cal = Calendar.getInstance()
-//            val date = Date(time * 1000L)
-//            cal.time = date
-//            val day = cal[Calendar.DAY_OF_MONTH]
-//            val month = cal.getDisplayName(Calendar.MONTH, Calendar.LONG, Locale.getDefault())
-//            val year = cal[Calendar.YEAR]
-//            val formatter: DateFormat = SimpleDateFormat("HH:mm", Locale.getDefault())
-//            val timeString = formatter.format(date)
-//            downloadedTime = "$day $month $year - $timeString"
-//        }
         datetime.text = relativeTime
 
         // BUTTON ----------------------------------
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt
index cb658ce6..95c2f9d0 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt
@@ -41,6 +41,10 @@ import com.google.android.material.chip.ChipGroup
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import java.io.File
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
+import kotlin.collections.ArrayList
 
 /**
  * A fragment representing a list of Items.
@@ -416,11 +420,9 @@ class HistoryFragment : Fragment(), HistoryAdapter.OnItemClickListener{
         val codec = bottomSheet!!.findViewById<TextView>(R.id.codec)
         val fileSize = bottomSheet!!.findViewById<TextView>(R.id.file_size)
 
-        time!!.text = DateUtils.getRelativeTimeSpanString(
-            item.time * 1000L,
-            System.currentTimeMillis(),
-            DateUtils.MINUTE_IN_MILLIS
-        )
+        val calendar = Calendar.getInstance()
+        calendar.timeInMillis = item.time * 1000L
+        time!!.text = SimpleDateFormat(android.text.format.DateFormat.getBestDateTimePattern(Locale.getDefault(), "ddMMMyyyy - HHmm"), Locale.getDefault()).format(calendar.time)
         time.isClickable = false
 
         if (item.format.format_note == "?" || item.format.format_note == "") formatNote!!.visibility = GONE
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt
index e2e15412..111086ce 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt
@@ -3,6 +3,7 @@ package com.deniscerri.ytdlnis.ui.downloads
 import android.app.Activity
 import android.content.res.Configuration
 import android.os.Bundle
+import android.text.format.DateFormat
 import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.View
@@ -36,6 +37,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.w3c.dom.Text
+import java.text.SimpleDateFormat
+import java.util.*
 
 
 class QueuedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickListener {
@@ -130,11 +133,9 @@ class QueuedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickLi
 
         if (item.downloadStartTime <= System.currentTimeMillis() / 1000) time!!.visibility = View.GONE
         else {
-            time!!.text = DateUtils.getRelativeTimeSpanString(
-                item.downloadStartTime,
-                System.currentTimeMillis(),
-                DateUtils.MINUTE_IN_MILLIS
-            )
+            val calendar = Calendar.getInstance()
+            calendar.timeInMillis = item.downloadStartTime
+            time!!.text = SimpleDateFormat(DateFormat.getBestDateTimePattern(Locale.getDefault(), "ddMMMyyyy - HHmm"), Locale.getDefault()).format(calendar.time)
 
             time.setOnClickListener {
                 uiUtil.showDatePicker(parentFragmentManager) {