diff --git a/app/build.gradle b/app/build.gradle
index 4ddd433..569f628 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "gr.ihu.iee.aboard.android"
         minSdkVersion 23
         targetSdkVersion 32
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
         resConfigs "en", "gr"
     }
 
diff --git a/app/src/main/java/gr/ihu/iee/aboard/android/util/service/MyFirebaseMessagingService.kt b/app/src/main/java/gr/ihu/iee/aboard/android/util/service/MyFirebaseMessagingService.kt
index 4baa4a5..d7b4e2f 100644
--- a/app/src/main/java/gr/ihu/iee/aboard/android/util/service/MyFirebaseMessagingService.kt
+++ b/app/src/main/java/gr/ihu/iee/aboard/android/util/service/MyFirebaseMessagingService.kt
@@ -58,7 +58,7 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
                 notificationManager.createNotificationChannel(notificationChannel)
             }
 
-            val id: Long = remoteMessage.data["id"]?.toLong() ?: -1
+            val id: String = remoteMessage.data["id"] ?: "-"
             val title: String = remoteMessage.data["title"] ?: "-"
             val tag: String = remoteMessage.data["tag"] ?: "-"
             val author: String = remoteMessage.data["author"] ?: "-"
@@ -71,7 +71,7 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
                 .setDefaults(Notification.DEFAULT_LIGHTS or Notification.DEFAULT_SOUND or Notification.DEFAULT_VIBRATE)
 
             val args = Bundle()
-            args.putLong("id", id)
+            args.putString("id", id)
             args.putString("title", tag)
 
             val pendingIntent: PendingIntent = NavDeepLinkBuilder(applicationContext)
diff --git a/app/src/main/res/layout/item_notification.xml b/app/src/main/res/layout/item_notification.xml
index ba51b07..a8bd157 100644
--- a/app/src/main/res/layout/item_notification.xml
+++ b/app/src/main/res/layout/item_notification.xml
@@ -21,6 +21,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
             android:ellipsize="end"
             android:fontFamily="@font/open_sans"
             android:textColor="?android:attr/textColorPrimary"
@@ -35,6 +36,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="4dp"
+            android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
             android:ellipsize="end"
             android:fontFamily="@font/open_sans_italic"