diff --git a/src/components/ChatComponents/ChatMessage.vue b/src/components/ChatComponents/ChatMessage.vue
index 0d05a808f6f0fc95f7170144436a6332dc7672be..3c63cef6850cdad57f8a1dd9ca9a39a7e3f96099 100644
--- a/src/components/ChatComponents/ChatMessage.vue
+++ b/src/components/ChatComponents/ChatMessage.vue
@@ -58,12 +58,18 @@ export default {
     calculateTime() {
       var time = this?.message.timestamp;
       var date = new Date(time);
-      //Todo add timing for mm and hh and week of message
+    
       var mmOfMessage = String(date.getMinutes());
       var hhOfMessage = String(date.getHours());
+      if(mmOfMessage <= 9){
+        mmOfMessage = "0" + mmOfMessage;
+      }
+      if(hhOfMessage<=9){
+        hhOfMessage = "0" + hhOfMessage;
+      }
       var ddOfMessage = String(date.getDate()).padStart(2, "0");
       var dayOfMessage = date.toLocaleString("default", { weekday: "short" });
-      var monthOfMessage = String(date.getMonth() + 1).padStart(2, "0"); //January is 0!
+      var monthOfMessage = String(date.getMonth() + 1).padStart(2, "0"); 
       const shortMonthOfMessage = date.toLocaleString("default", {
         month: "short",
       });
@@ -71,7 +77,7 @@ export default {
 
       var today = new Date();
       var dd = String(today.getDate()).padStart(2, "0");
-      var mm = String(today.getMonth() + 1).padStart(2, "0"); //January is 0!
+      var mm = String(today.getMonth() + 1).padStart(2, "0"); 
       var yyyy = today.getFullYear();
       if (ddOfMessage == dd) {
         return "" + hhOfMessage + ":" + mmOfMessage + "";
diff --git a/src/components/UserProfileComponents/RentHistoryComponents/RentHistoryItem.vue b/src/components/UserProfileComponents/RentHistoryComponents/RentHistoryItem.vue
index 675524104ec1ebe1b74410ae9114131c666f4023..c05823dcee3cd9a5bdcaf4661ec727d755346432 100644
--- a/src/components/UserProfileComponents/RentHistoryComponents/RentHistoryItem.vue
+++ b/src/components/UserProfileComponents/RentHistoryComponents/RentHistoryItem.vue
@@ -97,7 +97,10 @@ export default {
     getDateString(milliseconds) {
       let today = new Date();
       let date = new Date(milliseconds);
-      let dateString = date.getDate() + "." + (date.getMonth() + 1);
+      const shortMonthOfRentHistoryItem = date.toLocaleString("default", {
+        month: "short",
+      });
+      let dateString = date.getDate() + ". " + shortMonthOfRentHistoryItem;
 
       if (date.getFullYear() != today.getFullYear()) {
         dateString += "." + date.getFullYear();