From 2e014bbaec803f528ced648fea0f197eeaff470e Mon Sep 17 00:00:00 2001
From: yuval <yuvala2001@gmail.com>
Date: Sun, 31 Aug 2025 20:27:21 +0300
Subject: [PATCH] fixed bugs

---
 android_app/app/build.gradle                  |  2 +-
 .../java/com/asp/android_app/api/UserApi.java |  4 +-
 .../caching/entities/MailEntity.java          |  5 +-
 .../caching/utils/JsonConverters.java         | 20 +++-
 .../caching/utils/MailMappers.java            | 82 ++++++++++++----
 .../java/com/asp/android_app/model/Mail.java  | 14 ++-
 .../java/com/asp/android_app/model/User.java  |  8 ++
 .../model/request/RegisterRequest.java        | 39 ++++++++
 .../model/request/SendMailRequest.java        |  6 +-
 .../response/{Attachment.java => File.java}   | 22 ++---
 .../repository/MailRepository.java            | 78 +++++++++++----
 .../repository/UserRepository.java            |  9 +-
 .../asp/android_app/ui/ReadingActivity.java   | 20 ++--
 .../ui/auth_activity/SignupFragment.java      |  6 +-
 .../ui/compose_activity/ComposeFragment.java  | 35 ++++---
 .../ui/inbox_activity/InboxFragment.java      | 97 +++++++++++++++++--
 .../ui/inbox_activity/MailAdapter.java        | 42 +++++++-
 .../asp/android_app/utils/ComposeParams.java  |  8 +-
 .../android_app/viewmodel/MailViewModel.java  | 33 ++++++-
 .../src/main/res/layout/activity_reading.xml  |  2 +-
 .../src/main/res/layout/compose_fragment.xml  |  4 +-
 .../app/src/main/res/values/strings.xml       |  8 +-
 22 files changed, 421 insertions(+), 123 deletions(-)
 create mode 100644 android_app/app/src/main/java/com/asp/android_app/model/request/RegisterRequest.java
 rename android_app/app/src/main/java/com/asp/android_app/model/response/{Attachment.java => File.java} (72%)

diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle
index ee7989ab..23c8c8ab 100644
--- a/android_app/app/build.gradle
+++ b/android_app/app/build.gradle
@@ -12,7 +12,7 @@ android {
 
     defaultConfig {
         applicationId "com.asp.android_app"
-        minSdk 24
+        minSdk 26
         targetSdk 35
         versionCode 1
         versionName "1.0"
diff --git a/android_app/app/src/main/java/com/asp/android_app/api/UserApi.java b/android_app/app/src/main/java/com/asp/android_app/api/UserApi.java
index 6a6539f7..ba3dd610 100644
--- a/android_app/app/src/main/java/com/asp/android_app/api/UserApi.java
+++ b/android_app/app/src/main/java/com/asp/android_app/api/UserApi.java
@@ -1,8 +1,8 @@
 package com.asp.android_app.api;
 
-import com.asp.android_app.model.User;
 import com.asp.android_app.model.request.LoginRequest;
 import com.asp.android_app.model.request.ProfileImageRequest;
+import com.asp.android_app.model.request.RegisterRequest;
 import com.asp.android_app.model.response.AuthResponse;
 import com.asp.android_app.model.response.UserInfo;
 import com.asp.android_app.model.response.UserSearchResult;
@@ -25,7 +25,7 @@
 public interface UserApi {
 
     @POST("users")
-    Call<AuthResponse> register(@Body User user);
+    Call<AuthResponse> register(@Body RegisterRequest request);
 
     @POST("tokens")
     Call<AuthResponse> login(@Body LoginRequest loginRequest);
diff --git a/android_app/app/src/main/java/com/asp/android_app/caching/entities/MailEntity.java b/android_app/app/src/main/java/com/asp/android_app/caching/entities/MailEntity.java
index 11e67008..cdfae2df 100644
--- a/android_app/app/src/main/java/com/asp/android_app/caching/entities/MailEntity.java
+++ b/android_app/app/src/main/java/com/asp/android_app/caching/entities/MailEntity.java
@@ -1,3 +1,4 @@
+// Updated MailEntity.java
 package com.asp.android_app.caching.entities;
 
 import androidx.room.Entity;
@@ -8,7 +9,7 @@
  * Room cache model for a Mail.
  * - Denormalized for speed (flags directly on the row).
  * - We keep a few denormalized sender fields so lists render without joins.
- * - Recipients & attachment names are stored as JSON strings (simple & fast).
+ * - Recipients & attachment data are stored as JSON strings (simple & fast).
  * <p>
  * NOTE: We sort by sentAtEpoch (fallback to createdAtEpoch) to match backend's order.
  */
@@ -56,7 +57,7 @@ public class MailEntity {
 
     // JSON blobs to keep schema simple
     public String recipientsJson;      // List<UserLite> as JSON
-    public String attachmentNamesJson; // List<String> names only
+    public String attachmentsJson;     // CHANGED: Full File objects as JSON instead of just names
 
     // Bookkeeping for cache eviction (simple LRU)
     public long lastAccessEpoch;       // updated whenever we read/open
diff --git a/android_app/app/src/main/java/com/asp/android_app/caching/utils/JsonConverters.java b/android_app/app/src/main/java/com/asp/android_app/caching/utils/JsonConverters.java
index 5426dd3d..4da0dfff 100644
--- a/android_app/app/src/main/java/com/asp/android_app/caching/utils/JsonConverters.java
+++ b/android_app/app/src/main/java/com/asp/android_app/caching/utils/JsonConverters.java
@@ -1,9 +1,11 @@
+// Updated JsonConverters.java
 package com.asp.android_app.caching.utils;
 
 import androidx.annotation.Nullable;
 import androidx.room.TypeConverter;
 
 import com.asp.android_app.caching.entities.UserLite;
+import com.asp.android_app.model.response.File;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
@@ -13,14 +15,16 @@
 
 /**
  * Room TypeConverters for small JSON blobs.
- * - List<String> for attachment names
+ * - List<String> for simple string lists
  * - List<UserLite> for recipients
+ * - List<File> for complete attachment information
  * Keeping JSON simple avoids extra tables until we actually need them.
  */
 public class JsonConverters {
     private static final Gson gson = new Gson();
     private static final Type LIST_STRING = new TypeToken<List<String>>() {}.getType();
     private static final Type LIST_USERLITE = new TypeToken<List<UserLite>>() {}.getType();
+    private static final Type LIST_FILE = new TypeToken<List<File>>() {}.getType(); // ADDED
 
     @TypeConverter
     public static String listStringToJson(@Nullable List<String> list) {
@@ -43,4 +47,16 @@ public static List<UserLite> jsonToListUserLite(@Nullable String json) {
         if (json == null || json.isEmpty()) return Collections.emptyList();
         return gson.fromJson(json, LIST_USERLITE);
     }
-}
+
+    // ADDED: Converters for File objects
+    @TypeConverter
+    public static String listFileToJson(@Nullable List<File> list) {
+        return gson.toJson(list == null ? Collections.<File>emptyList() : list, LIST_FILE);
+    }
+
+    @TypeConverter
+    public static List<File> jsonToListFile(@Nullable String json) {
+        if (json == null || json.isEmpty()) return Collections.emptyList();
+        return gson.fromJson(json, LIST_FILE);
+    }
+}
\ No newline at end of file
diff --git a/android_app/app/src/main/java/com/asp/android_app/caching/utils/MailMappers.java b/android_app/app/src/main/java/com/asp/android_app/caching/utils/MailMappers.java
index c31c0378..0352c3c3 100644
--- a/android_app/app/src/main/java/com/asp/android_app/caching/utils/MailMappers.java
+++ b/android_app/app/src/main/java/com/asp/android_app/caching/utils/MailMappers.java
@@ -4,7 +4,7 @@
 import com.asp.android_app.caching.entities.UserLite;
 import com.asp.android_app.model.Label;
 import com.asp.android_app.model.Mail;
-import com.asp.android_app.model.response.Attachment;
+import com.asp.android_app.model.response.File;
 import com.asp.android_app.model.response.UserInfo;
 import com.google.gson.Gson;
 
@@ -26,7 +26,8 @@ private MailMappers() {}
     public static MailEntity toEntity(Mail m) {
         MailEntity e = new MailEntity();
         e.id = m.getId();
-        e.ownerId = m.getSender() != null ? m.getSender().getId() : 0; // server stores owner separately; we keep sender id for "sent" check using fromId==ownerId
+        e.ownerId = m.getSender() != null ? m.getSender().getId() : 0;
+
         // sender
         UserInfo from = m.getSender();
         e.fromId = (from != null ? from.getId() : 0);
@@ -37,20 +38,18 @@ public static MailEntity toEntity(Mail m) {
         e.subject = m.getSubject();
         e.body = m.getBody();
 
-        e.sentAtRaw = m.getSentAt();           // can be null/empty
-        e.createdAtRaw = m.getSentAt() == null ? "" : m.getSentAt(); // if you also expose createdAt in model, swap here
-        // you have createdAt in Mail; let's parse both
-        e.createdAtRaw = m.getClass().getDeclaredFields() != null ? (m.getClass() != null ? m.getClass().getName() : "") : e.createdAtRaw; // noop to avoid warnings
-        // actually parse safely:
+        e.sentAtRaw = m.getSentAt();
         e.sentAtEpoch = parseIsoToEpoch(m.getSentAt());
-        // createdAt exists in Mail class:
+
+        // Handle createdAt properly
         try {
             java.lang.reflect.Method getCreatedAt = m.getClass().getMethod("getCreatedAt");
             Object raw = getCreatedAt.invoke(m);
             e.createdAtRaw = raw != null ? raw.toString() : "";
             e.createdAtEpoch = parseIsoToEpoch(e.createdAtRaw);
         } catch (Exception ignore) {
-            e.createdAtEpoch = 0L;
+            e.createdAtRaw = e.sentAtRaw; // fallback
+            e.createdAtEpoch = e.sentAtEpoch;
         }
 
         e.isDraft = m.isDraft();
@@ -68,20 +67,67 @@ public static MailEntity toEntity(Mail m) {
         }
         e.recipientsJson = gson.toJson(recips);
 
-        // attachment names only
-        List<String> names = new ArrayList<>();
-        if (m.getAttachments() != null) {
-            for (Attachment a : m.getAttachments()) {
-                names.add(a.getName());
-            }
-        }
-        e.attachmentNamesJson = gson.toJson(names);
+        // FIXED: Store complete File objects instead of just names
+        e.attachmentsJson = gson.toJson(m.getAttachments() != null ? m.getAttachments() : new ArrayList<>());
 
         // default LRU timestamp now
         e.lastAccessEpoch = System.currentTimeMillis();
         return e;
     }
 
+    /**
+     * Convert MailEntity back to Mail object with complete attachment information
+     */
+    public static Mail fromEntity(MailEntity e) {
+        Mail m = new Mail();
+        m.setId(e.id);
+
+        // Reconstruct sender
+        UserInfo sender = new UserInfo(e.fromEmail, e.fromName);
+        try {
+            java.lang.reflect.Field fId = sender.getClass().getDeclaredField("id");
+            fId.setAccessible(true);
+            fId.set(sender, e.fromId);
+            java.lang.reflect.Field fImg = sender.getClass().getDeclaredField("image");
+            fImg.setAccessible(true);
+            fImg.set(sender, e.fromImageUrl);
+        } catch (Exception ignore) {}
+
+        m.setSubject(e.subject);
+        m.setBody(e.body);
+
+        // Set dates
+        try {
+            java.lang.reflect.Field fSentAt = m.getClass().getDeclaredField("sentAt");
+            fSentAt.setAccessible(true);
+            fSentAt.set(m, e.sentAtRaw);
+            java.lang.reflect.Field fCreatedAt = m.getClass().getDeclaredField("createdAt");
+            fCreatedAt.setAccessible(true);
+            fCreatedAt.set(m, e.createdAtRaw);
+            java.lang.reflect.Field fFrom = m.getClass().getDeclaredField("from");
+            fFrom.setAccessible(true);
+            fFrom.set(m, sender);
+        } catch (Exception ignore) {}
+
+        // flags
+        m.setIsRead(e.isRead);
+        m.setStarred(e.isStarred);
+        m.setTrashed(e.isTrashed);
+        m.setSpam(e.isSpam);
+        m.setIsDraft(e.isDraft);
+
+        // FIXED: Reconstruct complete attachments from JSON
+        try {
+            java.lang.reflect.Type fileListType = new com.google.gson.reflect.TypeToken<List<File>>(){}.getType();
+            List<File> attachments = gson.fromJson(e.attachmentsJson, fileListType);
+            m.setAttachments(attachments != null ? attachments : new ArrayList<>());
+        } catch (Exception ignore) {
+            m.setAttachments(new ArrayList<>());
+        }
+
+        return m;
+    }
+
     public static List<Integer> labelIds(List<Label> labels) {
         if (labels == null) return new ArrayList<>();
         return labels.stream().map(Label::getId).collect(Collectors.toList());
@@ -95,4 +141,4 @@ private static long parseIsoToEpoch(String iso) {
             return 0L;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/android_app/app/src/main/java/com/asp/android_app/model/Mail.java b/android_app/app/src/main/java/com/asp/android_app/model/Mail.java
index 3f3940f6..0b9a6327 100644
--- a/android_app/app/src/main/java/com/asp/android_app/model/Mail.java
+++ b/android_app/app/src/main/java/com/asp/android_app/model/Mail.java
@@ -1,6 +1,6 @@
 package com.asp.android_app.model;
 
-import com.asp.android_app.model.response.Attachment;
+import com.asp.android_app.model.response.File;
 import com.asp.android_app.model.response.UserInfo;
 
 import java.util.List;
@@ -26,7 +26,7 @@ public class Mail {
     private boolean isStarred;
     private boolean isTrashed;
     private boolean isSpam;
-    private List<Attachment> files;
+    private List<File> files;
     private List<Label> labels;
 
     /**
@@ -57,6 +57,10 @@ public List<UserInfo> getSentTo() {
         return sentTo;
     }
 
+    public void setSentTo(List<UserInfo> sentTo) {
+        this.sentTo = sentTo;
+    }
+
     /**
      * @return the subject of the mail
      */
@@ -162,10 +166,14 @@ public void setIsDraft(boolean isDraft) {
     /**
      * @return list of files attached to mail
      */
-    public List<Attachment> getAttachments() {
+    public List<File> getAttachments() {
         return files;
     }
 
+    public void setAttachments(List<File> files) {
+        this.files = files;
+    }
+
     /**
      * @return list of labels objects the mail is marked with
      */
diff --git a/android_app/app/src/main/java/com/asp/android_app/model/User.java b/android_app/app/src/main/java/com/asp/android_app/model/User.java
index 91128006..06223dbe 100644
--- a/android_app/app/src/main/java/com/asp/android_app/model/User.java
+++ b/android_app/app/src/main/java/com/asp/android_app/model/User.java
@@ -81,6 +81,14 @@ public String getMail() {
         return mail;
     }
 
+    public String getDateOfBirth() {
+        return this.dateOfBirth;
+    }
+
+    public String getImage() {
+        return this.image;
+    }
+
     /**
      * @param mail the email address to set
      */
diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/RegisterRequest.java b/android_app/app/src/main/java/com/asp/android_app/model/request/RegisterRequest.java
new file mode 100644
index 00000000..8b4f2884
--- /dev/null
+++ b/android_app/app/src/main/java/com/asp/android_app/model/request/RegisterRequest.java
@@ -0,0 +1,39 @@
+package com.asp.android_app.model.request;
+
+import com.asp.android_app.model.User;
+import com.google.gson.annotations.SerializedName;
+
+public class RegisterRequest {
+
+    @SerializedName("fullName")
+    private String fullName;
+
+    @SerializedName("mail")
+    private String mail;
+
+    @SerializedName("password")
+    private String password;
+
+    @SerializedName("dateOfBirth")
+    private String dateOfBirth;
+
+    @SerializedName("image")
+    private String image;
+
+    public RegisterRequest(String fullName, String mail, String password, String dateOfBirth, String image) {
+        this.fullName = fullName;
+        this.mail = mail;
+        this.password = password;
+        this.dateOfBirth = dateOfBirth;
+        this.image = image;
+    }
+
+    public RegisterRequest(User user) {
+        this.fullName = user.getFullName();
+        this.mail = user.getMail();
+        this.password = user.getPassword();
+        this.dateOfBirth = user.getDateOfBirth();
+        this.image = user.getImage();
+    }
+
+}
diff --git a/android_app/app/src/main/java/com/asp/android_app/model/request/SendMailRequest.java b/android_app/app/src/main/java/com/asp/android_app/model/request/SendMailRequest.java
index 48c377e3..53e9eedc 100644
--- a/android_app/app/src/main/java/com/asp/android_app/model/request/SendMailRequest.java
+++ b/android_app/app/src/main/java/com/asp/android_app/model/request/SendMailRequest.java
@@ -1,6 +1,6 @@
 package com.asp.android_app.model.request;
 
-import com.asp.android_app.model.response.Attachment;
+import com.asp.android_app.model.response.File;
 
 import java.util.List;
 
@@ -12,9 +12,9 @@ public class SendMailRequest {
     private String body;
     private List<String> sentTo;
     private boolean saveAsDraft;
-    private List<Attachment> files;
+    private List<File> files;
 
-    public SendMailRequest(String subject, String body, List<String> sentTo, boolean saveAsDraft, List<Attachment> files) {
+    public SendMailRequest(String subject, String body, List<String> sentTo, boolean saveAsDraft, List<File> files) {
         this.subject = subject;
         this.body = body;
         this.sentTo = sentTo;
diff --git a/android_app/app/src/main/java/com/asp/android_app/model/response/Attachment.java b/android_app/app/src/main/java/com/asp/android_app/model/response/File.java
similarity index 72%
rename from android_app/app/src/main/java/com/asp/android_app/model/response/Attachment.java
rename to android_app/app/src/main/java/com/asp/android_app/model/response/File.java
index 89f346eb..f02038c6 100644
--- a/android_app/app/src/main/java/com/asp/android_app/model/response/Attachment.java
+++ b/android_app/app/src/main/java/com/asp/android_app/model/response/File.java
@@ -5,7 +5,7 @@
 /**
  * Class to represent an attachment (file) sent in mails
  */
-public class Attachment implements Parcelable {
+public class File implements Parcelable {
 
     /**
      * File name
@@ -17,10 +17,10 @@ public class Attachment implements Parcelable {
      */
     private String data;
 
-    public Attachment() {
+    public File() {
     }
 
-    public Attachment(String name, String data) {
+    public File(String name, String data) {
         this.name = name;
         this.data = data;
     }
@@ -43,8 +43,8 @@ public boolean isImage() {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (!(o instanceof Attachment)) return false;
-        Attachment that = (Attachment) o;
+        if (!(o instanceof File)) return false;
+        File that = (File) o;
         return name != null && name.equals(that.name)
                 && data != null && data.equals(that.data);
     }
@@ -58,20 +58,20 @@ public int hashCode() {
 
 
     // ---- Parcelable bits ----
-    protected Attachment(android.os.Parcel in) {
+    protected File(android.os.Parcel in) {
         name = in.readString();
         data = in.readString();
     }
 
-    public static final Creator<Attachment> CREATOR = new Creator<Attachment>() {
+    public static final Creator<File> CREATOR = new Creator<File>() {
         @Override
-        public Attachment createFromParcel(android.os.Parcel in) {
-            return new Attachment(in);
+        public File createFromParcel(android.os.Parcel in) {
+            return new File(in);
         }
 
         @Override
-        public Attachment[] newArray(int size) {
-            return new Attachment[size];
+        public File[] newArray(int size) {
+            return new File[size];
         }
     };
 
diff --git a/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java b/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java
index 5990460c..583f0099 100644
--- a/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java
+++ b/android_app/app/src/main/java/com/asp/android_app/repository/MailRepository.java
@@ -11,6 +11,7 @@
 import com.asp.android_app.caching.entities.LabelEntity;
 import com.asp.android_app.caching.entities.MailEntity;
 import com.asp.android_app.caching.entities.MailLabelCrossRef;
+import com.asp.android_app.caching.entities.UserLite;
 import com.asp.android_app.caching.utils.LabelMappers;
 import com.asp.android_app.caching.utils.MailMappers;
 import com.asp.android_app.model.Label;
@@ -22,6 +23,7 @@
 import com.asp.android_app.model.response.UserInfo;
 import com.asp.android_app.utils.NetworkUtil;
 import com.asp.android_app.utils.Result;
+import com.google.gson.Gson;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -46,6 +48,8 @@ public class MailRepository {
     private final ExecutorService io;
     private final Context context;
 
+    private final int MAIL_LIMIT = 50;
+
     public MailRepository(Context context) {
         this.context = context;
         io = Executors.newSingleThreadExecutor();
@@ -63,8 +67,8 @@ private MailListResponse mapLocalToListResponse(List<MailEntity> entities) {
     }
 
     /**
-     * Converts Room MailEntity to network Mail (minimal for list screen).
-     * Keeping only necessary fields: sender name+email+image, subject, body, flags, dates, id.
+     * Converts Room MailEntity to network Mail (includes attachments and recipients).
+     * Now properly reconstructs attachments from cached JSON data.
      *
      * @return list of mails in Mail object instead of cache object
      */
@@ -73,6 +77,7 @@ private List<Mail> mapEntitiesToNetwork(List<MailEntity> es) {
         for (MailEntity e : es) {
             Mail m = new Mail();
             m.setId(e.id);
+
             // sender
             UserInfo sender = new UserInfo(e.fromEmail, e.fromName);
             try {
@@ -106,7 +111,40 @@ private List<Mail> mapEntitiesToNetwork(List<MailEntity> es) {
             m.setTrashed(e.isTrashed);
             m.setSpam(e.isSpam);
             m.setIsDraft(e.isDraft);
-            // we skip recipients/attachments for list; detail fetch can fill them
+
+            // FIXED: Reconstruct recipients from JSON
+            try {
+                java.lang.reflect.Type userLiteListType = new com.google.gson.reflect.TypeToken<List<UserLite>>(){}.getType();
+                List<UserLite> recipients = new Gson().fromJson(e.recipientsJson, userLiteListType);
+                if (recipients != null && !recipients.isEmpty()) {
+                    List<UserInfo> sentTo = new ArrayList<>();
+                    for (UserLite lite : recipients) {
+                        UserInfo recipient = new UserInfo(lite.mail, lite.fullName);
+                        try {
+                            java.lang.reflect.Field rId = recipient.getClass().getDeclaredField("id");
+                            rId.setAccessible(true);
+                            rId.set(recipient, lite.id);
+                            java.lang.reflect.Field rImg = recipient.getClass().getDeclaredField("image");
+                            rImg.setAccessible(true);
+                            rImg.set(recipient, lite.imageUrl);
+                        } catch (Exception ignore) {}
+                        sentTo.add(recipient);
+                    }
+                    m.setSentTo(sentTo);
+                }
+            } catch (Exception ignore) {
+                m.setSentTo(new ArrayList<>());
+            }
+
+            // FIXED: Reconstruct complete attachments from JSON instead of skipping them
+            try {
+                java.lang.reflect.Type fileListType = new com.google.gson.reflect.TypeToken<List<com.asp.android_app.model.response.File>>(){}.getType();
+                List<com.asp.android_app.model.response.File> attachments = new Gson().fromJson(e.attachmentsJson, fileListType);
+                m.setAttachments(attachments != null ? attachments : new ArrayList<>());
+            } catch (Exception ignore) {
+                m.setAttachments(new ArrayList<>());
+            }
+
             out.add(m);
         }
         return out;
@@ -172,7 +210,6 @@ private void upsertServerMails(List<Mail> mails) {
      * @param resultLiveData a LiveData object to observe result (mail list)
      */
     public void getMailsByType(String inboxType, int page, MutableLiveData<Result<MailListResponse>> resultLiveData) {
-        final int MAIL_LIMIT = 50;
         if (NetworkUtil.isOnline(context)) { // online - use backend
             resultLiveData.postValue(new Result.Loading<>());
 
@@ -182,9 +219,10 @@ public void onResponse(@NonNull Call<MailListResponse> call, @NonNull Response<M
                     io.execute(() -> {
                         if (resp.isSuccessful() && resp.body() != null) {
                             // Update cache with fresh network data
-                            updateCacheWithNetworkData(resp.body().getMails(), inboxType);
-                            List<MailEntity> freshData = getLocalByType(inboxType);
-                            resultLiveData.postValue(new Result.Success<>(mapLocalToListResponse(freshData)));
+                            updateCacheWithNetworkData(resp.body().getMails(), inboxType, page);
+                            resultLiveData.postValue(new Result.Success<>(resp.body()));
+                            //List<MailEntity> freshData = getLocalByType(inboxType);
+                            //resultLiveData.postValue(new Result.Success<>(mapLocalToListResponse(freshData)));
                         } else {
                             // Network failed, fall back to cache
                             handleNetworkFailureWithCacheFallback(inboxType, resultLiveData, "Error: " + resp.code());
@@ -228,16 +266,12 @@ private void handleNetworkFailureWithCacheFallback(
     /**
      * Update cache with fresh network data and handle conflicts properly
      */
-    private void updateCacheWithNetworkData(List<Mail> networkMails, String inboxType) {
-        if (networkMails == null || networkMails.isEmpty()) {
-            // If network returns empty, consider clearing stale cache for this inbox type
-            clearCacheForInboxType(inboxType);
-            return;
-        }
-
+    private void updateCacheWithNetworkData(List<Mail> networkMails, String inboxType, int page) {
+        if (networkMails == null)
+            networkMails = new ArrayList<>();
         // Clear existing cache for this inbox type to avoid stale data
-        clearCacheForInboxType(inboxType);
-
+        if (page == 1)
+            clearCacheForInboxType(inboxType);
         // Insert fresh network data
         upsertServerMails(networkMails);
     }
@@ -278,7 +312,6 @@ private void clearCacheForInboxType(String inboxType) {
      * @param resultLiveData LiveData object to observe result
      */
     public void getMailsByLabel(int labelId, int page, MutableLiveData<Result<MailListResponse>> resultLiveData) {
-        final int MAIL_LIMIT = 50;
 
         if (NetworkUtil.isOnline(context)) {
             resultLiveData.postValue(new Result.Loading<>());
@@ -289,11 +322,14 @@ public void onResponse(@NonNull Call<MailListResponse> call, @NonNull Response<M
                     io.execute(() -> {
                         if (resp.isSuccessful() && resp.body() != null) {
                             // Clear stale cache for this label
-                            localData.clearByLabel(labelId);
-                            // Update with fresh data
+                            if (page == 1) localData.clearByLabel(labelId);
                             upsertServerMails(resp.body().getMails());
-                            List<MailEntity> freshData = localData.getByLabel(labelId);
-                            resultLiveData.postValue(new Result.Success<>(mapLocalToListResponse(freshData)));
+
+                            // Update with fresh data
+                            resultLiveData.postValue(new Result.Success<>(resp.body()));
+                            //upsertServerMails(resp.body().getMails());
+                            //List<MailEntity> freshData = localData.getByLabel(labelId);
+                            //resultLiveData.postValue(new Result.Success<>(mapLocalToListResponse(freshData)));
                         } else {
                             // Network failed, fall back to cache
                             List<MailEntity> cached = localData.getByLabel(labelId);
diff --git a/android_app/app/src/main/java/com/asp/android_app/repository/UserRepository.java b/android_app/app/src/main/java/com/asp/android_app/repository/UserRepository.java
index 0d96d96f..20370ad8 100644
--- a/android_app/app/src/main/java/com/asp/android_app/repository/UserRepository.java
+++ b/android_app/app/src/main/java/com/asp/android_app/repository/UserRepository.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.util.Log;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
@@ -12,6 +11,7 @@
 import com.asp.android_app.model.User;
 import com.asp.android_app.model.request.LoginRequest;
 import com.asp.android_app.model.request.ProfileImageRequest;
+import com.asp.android_app.model.request.RegisterRequest;
 import com.asp.android_app.model.response.AuthResponse;
 import com.asp.android_app.model.response.UserInfo;
 import com.asp.android_app.model.response.UserSearchResult;
@@ -39,9 +39,10 @@ public void login(LoginRequest request, MutableLiveData<Result<AuthResponse>> re
         userApi.login(request).enqueue(createCallback(resultLiveData));
     }
 
-    public void register(User user, MutableLiveData<Result<AuthResponse>> resultLiveData) {
+    public void register(User u, MutableLiveData<Result<AuthResponse>> resultLiveData) {
         resultLiveData.postValue(new Result.Loading<>());
-        userApi.register(user).enqueue(createCallback(resultLiveData));
+        RegisterRequest req = new RegisterRequest(u);
+        userApi.register(req).enqueue(createCallback(resultLiveData));
     }
 
     public void validateToken(MutableLiveData<Result<AuthResponse>> resultLiveData) {
@@ -111,7 +112,7 @@ public void onResponse(@NonNull Call<T> call, @NonNull Response<T> response) {
                 if (response.isSuccessful()) {
                     liveData.postValue(new Result.Success<>(response.body()));
                 } else {
-                    liveData.postValue(new Result.Error<>("Error: " + response.code()));
+                    liveData.postValue(new Result.Error<>("Error: " + response.raw()));
                 }
             }
 
diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/ReadingActivity.java b/android_app/app/src/main/java/com/asp/android_app/ui/ReadingActivity.java
index 70bfcfa8..1d6fbb6b 100644
--- a/android_app/app/src/main/java/com/asp/android_app/ui/ReadingActivity.java
+++ b/android_app/app/src/main/java/com/asp/android_app/ui/ReadingActivity.java
@@ -40,7 +40,7 @@
 import com.asp.android_app.model.Label;
 import com.asp.android_app.model.Mail;
 import com.asp.android_app.model.request.SpamRequest;
-import com.asp.android_app.model.response.Attachment;
+import com.asp.android_app.model.response.File;
 import com.asp.android_app.model.response.UserInfo;
 import com.asp.android_app.ui.compose_activity.ComposeMailActivity;
 import com.asp.android_app.utils.ComposeNavigation;
@@ -334,8 +334,8 @@ private void showMailContent(Mail mail) {
         }
 
         // if there are no attachments - hide the header
-        List<Attachment> attachments = mail.getAttachments();
-        if (attachments == null || attachments.isEmpty()) {
+        List<File> files = mail.getAttachments();
+        if (files == null || files.isEmpty()) {
             attachmentsContainer.setVisibility(GONE);
         } else {
             attachmentsContainer.setVisibility(View.VISIBLE);
@@ -346,22 +346,22 @@ private void showMailContent(Mail mail) {
     /**
      * Shows mail attachments as a horizontal list
      *
-     * @param attachments list of attachments in mail
+     * @param files list of attachments in mail
      */
-    private void showAttachments(List<Attachment> attachments) {
+    private void showAttachments(List<File> files) {
         LinearLayout attachmentsLayout = findViewById(R.id.attachmentsLayout);
         attachmentsLayout.removeAllViews(); // Clear any previous ones
-        for (Attachment attachment : attachments) {
+        for (File file : files) {
             View attachmentView = getLayoutInflater().inflate(R.layout.attachment_item, attachmentsLayout, false);
             TextView fileName = attachmentView.findViewById(R.id.attachment_name);
             ImageView thumbnail = attachmentView.findViewById(R.id.attachment_thumbnail);
             // set resources
-            fileName.setText(attachment.getName());
-            int iconRes = getFileIconResource(attachment.getName());
+            fileName.setText(file.getName());
+            int iconRes = getFileIconResource(file.getName());
             thumbnail.setImageResource(iconRes);
             // cache and preview on click
             attachmentView.setOnClickListener(v -> {
-                openFile(attachment.getName(), attachment.getData());
+                openFile(file.getName(), file.getData());
             });
             attachmentsLayout.addView(attachmentView);
         }
@@ -495,7 +495,7 @@ private void onForwardClick() {
         params.subject = MailHtmlUtil.subjectForForward(mail.getSubject());
         params.quotedHtml = MailHtmlUtil.buildForwardQuotedHtml(mail);
         if (mail.getAttachments() != null)
-            params.attachments.addAll(mail.getAttachments());
+            params.files.addAll(mail.getAttachments());
         params.isForward = true;
 
         Intent i = ComposeMailActivity.newIntent(this, params);
diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/SignupFragment.java b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/SignupFragment.java
index 3f4b5d39..2a8178f7 100644
--- a/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/SignupFragment.java
+++ b/android_app/app/src/main/java/com/asp/android_app/ui/auth_activity/SignupFragment.java
@@ -189,7 +189,7 @@ private void handleSignup() {
             return;
 
         // register
-        User newUser = new User(email, password, name, birthDate, imageBase64);
+        User newUser = new User(name, email, password, birthDate, imageBase64);
         userViewModel.register(newUser);
         // wait for results
         userViewModel.getAuthResult().observe(getViewLifecycleOwner(), result -> {
@@ -197,7 +197,7 @@ private void handleSignup() {
                 AuthResponse auth = ((Result.Success<AuthResponse>) result).getData();
                 handleSignupSuccess(auth);
             } else if (result instanceof Result.Error) {
-                String msg = ((Result.Error<?>) result).getMessage();
+                String msg = ((Result.Error<?>) result).toString();
                 handleSignupErrors(msg, emailLayout);
             }
         });
@@ -227,7 +227,7 @@ private void handleSignupSuccess(AuthResponse auth) {
     private void handleSignupErrors(String msg, TextInputLayout emailLayout) {
         Log.i("signup error:", msg);
         // error of already existing mail address
-        if (msg.contains("400") || msg.contains("exists")) {
+        if (msg.contains("400") && msg.contains("exists")) {
             emailLayout.setError("Email address taken");
             return;
         }
diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/compose_activity/ComposeFragment.java b/android_app/app/src/main/java/com/asp/android_app/ui/compose_activity/ComposeFragment.java
index d94d9002..7e0cccd1 100644
--- a/android_app/app/src/main/java/com/asp/android_app/ui/compose_activity/ComposeFragment.java
+++ b/android_app/app/src/main/java/com/asp/android_app/ui/compose_activity/ComposeFragment.java
@@ -29,7 +29,7 @@
 import com.asp.android_app.R;
 import com.asp.android_app.model.Mail;
 import com.asp.android_app.model.request.SendMailRequest;
-import com.asp.android_app.model.response.Attachment;
+import com.asp.android_app.model.response.File;
 import com.asp.android_app.model.response.UserInfo;
 import com.asp.android_app.model.response.UserSearchResult;
 import com.asp.android_app.utils.Base64Converter;
@@ -39,7 +39,6 @@
 import com.asp.android_app.viewmodel.UserViewModel;
 import com.google.android.material.chip.Chip;
 import com.google.android.material.chip.ChipGroup;
-import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.textfield.MaterialAutoCompleteTextView;
 import com.google.android.material.textfield.TextInputEditText;
 
@@ -79,7 +78,7 @@ public class ComposeFragment extends Fragment {
     /**
      * holds the attachments to send; reflected in chipsAttachments
      */
-    private final List<Attachment> attachments = new ArrayList<>();
+    private final List<File> files = new ArrayList<>();
 
     private SuggestionAdapter suggestionAdapter;
     private final Handler debounceHandler = new Handler(Looper.getMainLooper());
@@ -227,9 +226,9 @@ public void afterTextChanged(Editable s) {
             if (prefill.subject != null) etSubject.setText(prefill.subject);
             quotedHtml = prefill.quotedHtml;
 
-            if (prefill.attachments != null && !prefill.attachments.isEmpty())
-                for (Attachment a : prefill.attachments) {
-                    attachments.add(a);
+            if (prefill.files != null && !prefill.files.isEmpty())
+                for (File a : prefill.files) {
+                    files.add(a);
                     addAttachmentChip(a);
                 }
         }
@@ -274,9 +273,9 @@ private void handlePickedUri(@NonNull Uri uri) {
                 return;
             }
 
-            Attachment att = new Attachment(displayName != null ? displayName : "file", dataUri);
-            if (!attachments.contains(att)) {
-                attachments.add(att);
+            File att = new File(displayName != null ? displayName : "file", dataUri);
+            if (!files.contains(att)) {
+                files.add(att);
                 addAttachmentChip(att);
             }
         } catch (SecurityException se) {
@@ -284,9 +283,9 @@ private void handlePickedUri(@NonNull Uri uri) {
             String displayName = queryDisplayName(uri);
             String dataUri = Base64Converter.fileUriToBase64(uri, requireContext());
             if (!dataUri.isEmpty()) {
-                Attachment att = new Attachment(displayName != null ? displayName : "file", dataUri);
-                if (!attachments.contains(att)) {
-                    attachments.add(att);
+                File att = new File(displayName != null ? displayName : "file", dataUri);
+                if (!files.contains(att)) {
+                    files.add(att);
                     addAttachmentChip(att);
                 }
             } else {
@@ -300,7 +299,7 @@ private void handlePickedUri(@NonNull Uri uri) {
     /**
      * Renders a single attachment as a Material chip with an icon + close (remove).
      */
-    private void addAttachmentChip(@NonNull Attachment att) {
+    private void addAttachmentChip(@NonNull File att) {
         Chip chip = new Chip(requireContext());
         chip.setText(att.getName());
         int iconRes = Base64Converter.getFileIconResource(att.getName());
@@ -308,7 +307,7 @@ private void addAttachmentChip(@NonNull Attachment att) {
         chip.setCloseIconVisible(true);
         chip.setOnCloseIconClickListener(v -> {
             chipsAttachments.removeView(chip);
-            attachments.remove(att);
+            files.remove(att);
         });
         chipsAttachments.addView(chip);
     }
@@ -331,10 +330,10 @@ private void initializeMailViewModel() {
 
                 // If the draft already has attachments, show them
                 if (draft.getAttachments() != null && !draft.getAttachments().isEmpty()) {
-                    attachments.clear();
-                    attachments.addAll(draft.getAttachments());
+                    files.clear();
+                    files.addAll(draft.getAttachments());
                     chipsAttachments.removeAllViews();
-                    for (Attachment a : attachments) addAttachmentChip(a);
+                    for (File a : files) addAttachmentChip(a);
                 }
 
             } else if (result instanceof Result.Error) {
@@ -425,7 +424,7 @@ private SendMailRequest buildRequest(boolean saveAsDraft) {
         String body = com.asp.android_app.utils.MailHtmlUtil.mergeTypedWithQuote(typed, quotedHtml);
 
         // pass the attachments that were added
-        return new SendMailRequest(subject, body, sentTo, saveAsDraft, new ArrayList<>(attachments));
+        return new SendMailRequest(subject, body, sentTo, saveAsDraft, new ArrayList<>(files));
     }
 
     /**
diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/InboxFragment.java b/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/InboxFragment.java
index 308c2ba8..9a62adb9 100644
--- a/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/InboxFragment.java
+++ b/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/InboxFragment.java
@@ -68,6 +68,10 @@ public class InboxFragment extends Fragment {
                 }
             });
 
+    private boolean isLoading = false;
+    private boolean hasMoreData = true;
+    private int PAGE_LIMIT = 50;
+
     private LinearLayout emptyStateContainer;
     private TextView emptyStateTitle;
     private TextView emptyStateSubtitle;
@@ -124,6 +128,7 @@ public void onSaved() {
         recyclerView.setAdapter(mailAdapter);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         initializeEmptyState(view);
+        setupPaginationScrollListener(recyclerView);
 
         // initialize the swiping down for refresh
         SwipeRefreshLayout swipeRefreshLayout = view.findViewById(R.id.swipeRefreshLayout);
@@ -139,9 +144,55 @@ public void onSaved() {
         return view;
     }
 
+    /**
+     * Sets up the pagination listeners to load in a 'lazy loading' way
+     *
+     * @param recyclerView the recycler view to load into
+     */
+    private void setupPaginationScrollListener(RecyclerView recyclerView) {
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+
+                LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+                if (layoutManager != null && !isLoading && hasMoreData && dy > 0) {
+                    int visibleItemCount = layoutManager.getChildCount();
+                    int totalItemCount = layoutManager.getItemCount();
+                    int firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition();
+
+                    // Load more when we're 5 items from the bottom
+                    if ((visibleItemCount + firstVisibleItemPosition + 5) >= totalItemCount) {
+                        loadNextPage();
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * Loads the next batch of mails
+     */
+    private void loadNextPage() {
+        if (isLoading || !hasMoreData) return;
+
+        isLoading = true;
+        if (inboxType.startsWith("label:")) {
+            int labelId = Integer.parseInt(inboxType.substring("label:".length()));
+            mailViewModel.nextPage("label:" + labelId);
+            mailViewModel.loadMoreMailsByLabel(labelId);
+            //mailViewModel.loadMailsByLabel(labelId);
+        } else {
+            mailViewModel.nextPage(inboxType);
+            mailViewModel.loadMoreMails(inboxType);
+            //mailViewModel.loadMails(inboxType);
+        }
+    }
+
     /**
      * initializes the alternative view of an empty inbox, showing dynamic message depending on the
      * inbox's type
+     *
      * @param view root view object
      */
     private void initializeEmptyState(View view) {
@@ -177,6 +228,7 @@ private void initializeEmptyState(View view) {
 
     /**
      * updates the content according to the inbox's type and state
+     *
      * @param inboxType inbox's type
      */
     private void updateEmptyStateContent(String inboxType) {
@@ -257,6 +309,7 @@ private void updateEmptyStateContent(String inboxType) {
 
     /**
      * Toggles between an empty inbox state view and the regular
+     *
      * @param isEmpty true if should show the empty inbox UI, otherwise will show the inbox
      */
     private void toggleEmptyState(boolean isEmpty) {
@@ -285,21 +338,46 @@ private void observeViewModel(SwipeRefreshLayout swipeRefreshLayout) {
         mailViewModel.getMailsLiveData().observe(getViewLifecycleOwner(), result -> {
             if (result instanceof Result.Loading) {
                 Log.i("loadMails", inboxType);
-                swipeRefreshLayout.setRefreshing(true);
-                toggleEmptyState(false);
+                if (!isLoading) {
+                    swipeRefreshLayout.setRefreshing(true);
+                    toggleEmptyState(false);
+                }
             } else if (result instanceof Result.Success) {
-                MailListResponse mails = ((Result.Success<MailListResponse>) result).getData();
-                mailAdapter.setMailList(mails.getMails());
+                MailListResponse response = ((Result.Success<MailListResponse>) result).getData();
+                List<Mail> newMails = response.getMails();
+                // stop loading state
+                isLoading = false;
+                mailViewModel.setLoadingMore(false);
                 swipeRefreshLayout.setRefreshing(false);
-                // Show empty state if no mails
-                boolean isEmpty = mails.getMails() == null || mails.getMails().isEmpty();
-                toggleEmptyState(isEmpty);
+
+                if (mailViewModel.getCurrentPage() == 1) {
+                    mailAdapter.setMailList(newMails);
+                    // Show empty state if no mails
+                    boolean isEmpty = newMails == null || newMails.isEmpty();
+                    toggleEmptyState(isEmpty);
+                } else {
+                    // Subsequent pages - append mails
+                    if (newMails != null && !newMails.isEmpty()) {
+                        mailAdapter.appendMails(newMails);
+                        hasMoreData = newMails.size() >= PAGE_LIMIT; // Assume no more data if less than limit
+                    } else {
+                        hasMoreData = false; // No more data available
+                    }
+                }
+
             } else if (result instanceof Result.Error) {
+                isLoading = false;
+                mailViewModel.setLoadingMore(false);
                 swipeRefreshLayout.setRefreshing(false);
+
                 String msg = ((Result.Error<?>) result).getMessage();
                 Log.i("err", msg);
                 Toast.makeText(getContext(), getResources().getString(R.string.err_mails_load) + msg, Toast.LENGTH_LONG).show();
                 // Don't show empty state on error, just leave current state
+
+                // If it was a pagination request that failed, decrement page
+                if (mailViewModel.getCurrentPage() > 1)
+                    mailViewModel.previousPage(inboxType);
             }
         });
 
@@ -410,6 +488,11 @@ public void setInbox(String newInboxType) {
         if (newInboxType == null)
             return;
         this.inboxType = newInboxType;
+        // reset pagination
+        isLoading = false;
+        hasMoreData = true;
+        mailViewModel.resetPage();
+
         if (inboxType.startsWith("label:")) {
             int labelId = Integer.parseInt(inboxType.substring("label:".length()));
             mailViewModel.loadMailsByLabel(labelId);
diff --git a/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/MailAdapter.java b/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/MailAdapter.java
index ace40b95..8e040123 100644
--- a/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/MailAdapter.java
+++ b/android_app/app/src/main/java/com/asp/android_app/ui/inbox_activity/MailAdapter.java
@@ -34,6 +34,7 @@
 import com.google.android.material.card.MaterialCardView;
 import com.google.android.material.imageview.ShapeableImageView;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -81,11 +82,6 @@ public MailAdapter(
         });
     }
 
-    public void setMailList(List<Mail> mailList) {
-        this.mailList = mailList;
-        notifyDataSetChanged();
-    }
-
     @NonNull
     @Override
     public MailViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -249,6 +245,42 @@ private void handleStarCheckbox(@NonNull MailViewHolder holder, int position) {
         });
     }
 
+    /**
+     * Appends new mails to the existing list (for pagination)
+     */
+    public void appendMails(List<Mail> newMails) {
+        if (newMails == null || newMails.isEmpty()) {
+            return;
+        }
+
+        int startPosition = this.mailList.size();
+        this.mailList.addAll(newMails);
+        notifyItemRangeInserted(startPosition, newMails.size());
+    }
+
+    /**
+     * Clears the current mail list and sets a new one (for refresh/new inbox)
+     */
+    public void setMailList(List<Mail> mails) {
+        if (this.mailList == null)
+            this.mailList = new ArrayList<>();
+
+        this.mailList.clear();
+        clearSelection();
+
+        if (mails != null) {
+            this.mailList.addAll(mails);
+        }
+        notifyDataSetChanged();
+    }
+
+    /**
+     * Returns the current number of mails in the adapter
+     */
+    public int getCurrentMailCount() {
+        return mailList.size();
+    }
+
     @Override
     public int getItemCount() {
         return mailList != null ? mailList.size() : 0;
diff --git a/android_app/app/src/main/java/com/asp/android_app/utils/ComposeParams.java b/android_app/app/src/main/java/com/asp/android_app/utils/ComposeParams.java
index e7952b2c..0156ff4e 100644
--- a/android_app/app/src/main/java/com/asp/android_app/utils/ComposeParams.java
+++ b/android_app/app/src/main/java/com/asp/android_app/utils/ComposeParams.java
@@ -5,7 +5,7 @@
 
 import androidx.annotation.Nullable;
 
-import com.asp.android_app.model.response.Attachment;
+import com.asp.android_app.model.response.File;
 import com.asp.android_app.model.response.UserInfo;
 
 import java.util.ArrayList;
@@ -34,7 +34,7 @@ public class ComposeParams implements Parcelable {
     /**
      * files to pre-fill (for Forward)
      */
-    public ArrayList<Attachment> attachments = new ArrayList<>();
+    public ArrayList<File> files = new ArrayList<>();
 
     /**
      * flags for analytics/debug if needed
@@ -49,7 +49,7 @@ protected ComposeParams(Parcel in) {
         recipients = in.createTypedArrayList(UserInfo.CREATOR);
         subject = in.readString();
         quotedHtml = in.readString();
-        attachments = in.createTypedArrayList(Attachment.CREATOR);
+        files = in.createTypedArrayList(File.CREATOR);
         isReply = in.readByte() != 0;
         isForward = in.readByte() != 0;
     }
@@ -76,7 +76,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeTypedList(recipients);
         dest.writeString(subject);
         dest.writeString(quotedHtml);
-        dest.writeTypedList(attachments);
+        dest.writeTypedList(files);
         dest.writeByte((byte) (isReply ? 1 : 0));
         dest.writeByte((byte) (isForward ? 1 : 0));
     }
diff --git a/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java b/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java
index b0426022..264e8713 100644
--- a/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java
+++ b/android_app/app/src/main/java/com/asp/android_app/viewmodel/MailViewModel.java
@@ -33,6 +33,7 @@ public class MailViewModel extends AndroidViewModel {
     private final MutableLiveData<Result<Void>> sendMailStatus = new MutableLiveData<>();
 
     private int currentPage = 1;
+    private boolean isLoadingMore = false;
 
     public MailViewModel(@NonNull Application application) {
         super(application);
@@ -60,17 +61,27 @@ public LiveData<Result<Void>> getSendMailStatus() {
     }
 
     /**
-     * Fetches mails for the given inbox type and current page.
+     *  Loads the first page of mails (replaces current list)
      *
      * @param inboxType the inbox type ("incoming", "sent", etc.)
      */
     public void loadMails(String inboxType) {
+        resetPage();
+        isLoadingMore = false;
+        mailRepository.getMailsByType(inboxType, currentPage, mailsListLiveData);
+    }
+
+    /**
+     * Loads more mails for pagination (appends to current list)
+     */
+    public void loadMoreMails(String inboxType) {
+        if (isLoadingMore) return;
+        isLoadingMore = true;
         mailRepository.getMailsByType(inboxType, currentPage, mailsListLiveData);
     }
 
     public void nextPage(String inboxType) {
         currentPage++;
-        loadMails(inboxType);
     }
 
     public void previousPage(String inboxType) {
@@ -86,6 +97,14 @@ public void resetPage() {
         currentPage = 1;
     }
 
+    public boolean isLoadingMore() {
+        return isLoadingMore;
+    }
+
+    public void setLoadingMore(boolean loading) {
+        isLoadingMore = loading;
+    }
+
     /**
      * Fetches a mail with a given id
      *
@@ -101,6 +120,16 @@ public void fetchMailById(int mailId) {
      * @param labelId the label ID
      */
     public void loadMailsByLabel(int labelId) {
+        resetPage();
+        isLoadingMore = false;
+        mailRepository.getMailsByLabel(labelId, currentPage, mailsListLiveData);    }
+
+    /**
+     * Loads more mails by label for pagination (appends to current list)
+     */
+    public void loadMoreMailsByLabel(int labelId) {
+        if (isLoadingMore) return;
+        isLoadingMore = true;
         mailRepository.getMailsByLabel(labelId, currentPage, mailsListLiveData);
     }
 
diff --git a/android_app/app/src/main/res/layout/activity_reading.xml b/android_app/app/src/main/res/layout/activity_reading.xml
index 38845b57..443a87e4 100644
--- a/android_app/app/src/main/res/layout/activity_reading.xml
+++ b/android_app/app/src/main/res/layout/activity_reading.xml
@@ -188,7 +188,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="8dp"
-                        android:text="@string/attachments"
+                        android:text="@string/files"
                         android:textStyle="bold" />
 
                     <HorizontalScrollView
diff --git a/android_app/app/src/main/res/layout/compose_fragment.xml b/android_app/app/src/main/res/layout/compose_fragment.xml
index b01d7f47..cc162802 100644
--- a/android_app/app/src/main/res/layout/compose_fragment.xml
+++ b/android_app/app/src/main/res/layout/compose_fragment.xml
@@ -160,7 +160,7 @@
                         android:layout_width="20dp"
                         android:layout_height="20dp"
                         android:layout_marginEnd="8dp"
-                        android:contentDescription="@string/attachments"
+                        android:contentDescription="@string/files"
                         android:src="@drawable/ic_attachment" />
 
                     <TextView
@@ -196,7 +196,7 @@
                     android:textSize="12sp"
                     android:visibility="gone" />
 
-                <!-- Selected attachments as chips -->
+                <!-- Selected files as chips -->
                 <com.google.android.material.chip.ChipGroup
                     android:id="@+id/chips_attachments"
                     android:layout_width="match_parent"
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index d39e978a..b78ca911 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -70,7 +70,7 @@
     <string name="logout_user">Logout</string>
 
     <!-- Strings used in mail reading page -->
-    <string name="attachments">Attachments:</string>
+    <string name="files">Attachments:</string>
     <string name="reply">Reply</string>
     <string name="forward">Forward</string>
     <string name="star_error">Failed to un/star</string>
@@ -78,7 +78,7 @@
     <string name="more_recipients">Sent to ▼</string>
     <string name="hide_recipients">Sent to ▲</string>
     <string name="no_recipients">to nobody</string>
-    <string name="attachment_desc">attachment</string>
+    <string name="attachment_desc">file</string>
     <string name="label">Label</string>
 
     <!-- Strings used in mail reading menus -->
@@ -95,10 +95,10 @@
     <string name="compose_body">Type message here</string>
     <string name="compose_send">Send</string>
     <string name="compose_save_draft">Save draft</string>
-    <string name="compose_add_attachment">Add attachment</string>
+    <string name="compose_add_attachment">Add file</string>
     <string name="compose_attachment_hint">You can pick multiple files</string>
     <string name="err_file_too_large">One of the files is too large</string>
-    <string name="err_attachment_failed">Failed to read an attachment</string>
+    <string name="err_attachment_failed">Failed to read an file</string>
     <string name="err_min_recipients">Need at least 1 recipient!</string>
     <string name="compose_saved_success">Draft saved!</string>
     <string name="compose_sent_success">Mail sent!</string>