@@ -175,6 +175,11 @@ def test_gif(self):
 
     def test_sticker(self):
         assert viewer._media_type_from_path("foo/Sticker/abc.webp") == "sticker"
+        assert viewer._media_type_from_path("foo/stickers/abc.webp") == "sticker"
+        assert (
+            viewer._media_type_from_path("Groups/Chat/2026/STK-20260101-WA0001.webp") == "sticker"
+        )
+        assert viewer._media_type_from_path("Groups/Chat/2026/STK-20260101-WA0001.was") == "sticker"
 
     def test_document(self):
         assert viewer._media_type_from_path("foo/document.pdf") == "document"
@@ -7057,3 +7062,160 @@ def test_frontend_assets_include_msg_edited(self):
         css_content = css_path.read_text(encoding="utf-8")
         assert "msg-edited" in js_content
         assert "msg-edited" in css_content
+
+
+class TestStickerSupport:
+    def test_ios_sticker_classification_and_gallery(self, tmp_path):
+        archive_path_db = tmp_path / ".wa_media_archiver.db"
+        archive_conn = make_archive_db(archive_path_db)
+        archive_conn.execute("INSERT INTO contacts (number, folder) VALUES ('44123456', 'Alice')")
+        archive_conn.execute(
+            "INSERT INTO archive_copies (original_path, archive_path) VALUES ('Message/Media/123/abc.webp', 'Contacts/Alice/2026/abc.webp')"
+        )
+        archive_conn.commit()
+        archive_conn.close()
+
+        wa_conn = sqlite3.connect(str(tmp_path / "ChatStorage.sqlite"))
+        wa_conn.executescript("""
+            CREATE TABLE ZWACHATSESSION (
+                Z_PK INTEGER PRIMARY KEY,
+                ZCONTACTJID TEXT,
+                ZGROUPINFO INTEGER,
+                ZPARTNERNAME TEXT,
+                ZHIDDEN INTEGER DEFAULT 0
+            );
+            CREATE TABLE ZWAMEDIAITEM (
+                Z_PK INTEGER PRIMARY KEY,
+                ZMEDIALOCALPATH TEXT,
+                ZTITLE TEXT,
+                ZVCARDNAME TEXT,
+                ZVCARDSTRING TEXT
+            );
+            CREATE TABLE ZWAGROUPMEMBER (
+                Z_PK INTEGER PRIMARY KEY,
+                ZMEMBERJID TEXT,
+                ZCONTACTNAME TEXT
+            );
+            CREATE TABLE ZWAPROFILEPUSHNAME (
+                ZJID TEXT,
+                ZPUSHNAME TEXT
+            );
+            CREATE TABLE ZWAMESSAGE (
+                Z_PK INTEGER PRIMARY KEY,
+                ZCHATSESSION INTEGER,
+                ZISFROMME INTEGER,
+                ZMESSAGEDATE REAL,
+                ZMESSAGETYPE INTEGER,
+                ZTEXT TEXT,
+                ZMEDIAITEM INTEGER,
+                ZFROMJID TEXT,
+                ZSTANZAID TEXT,
+                ZPARENTMESSAGE INTEGER,
+                ZPUSHNAME TEXT,
+                ZGROUPMEMBER INTEGER
+            );
+        """)
+        wa_conn.execute(
+            "INSERT INTO ZWACHATSESSION (Z_PK, ZCONTACTJID, ZGROUPINFO, ZPARTNERNAME) VALUES (1, '44123456@s.whatsapp.net', NULL, 'Alice')"
+        )
+        wa_conn.execute(
+            "INSERT INTO ZWAMEDIAITEM (Z_PK, ZMEDIALOCALPATH, ZTITLE) VALUES (1, 'Media/123/abc.webp', NULL)"
+        )
+        wa_conn.execute(
+            "INSERT INTO ZWAMESSAGE (Z_PK, ZCHATSESSION, ZISFROMME, ZMESSAGEDATE, ZMESSAGETYPE, ZTEXT, ZMEDIAITEM) VALUES (1, 1, 0, 700000000.0, 15, NULL, 1)"
+        )
+        wa_conn.commit()
+        wa_conn.close()
+
+        app = viewer.create_app(tmp_path, rescan=False)
+        with app.test_client() as client:
+            # 1. /api/messages classifies as sticker
+            resp = client.get("/api/messages?chat_id=1&chat_type=contact")
+            assert resp.status_code == 200
+            msgs = resp.get_json()
+            assert len(msgs) == 1
+            assert msgs[0]["media_type"] == "sticker"
+            assert msgs[0]["archive_path"] == "Contacts/Alice/2026/abc.webp"
+
+            # 2. /api/chats classifies last_msg_type as sticker
+            chats_resp = client.get("/api/chats")
+            assert chats_resp.status_code == 200
+            chats = chats_resp.get_json()
+            assert len(chats) == 1
+            assert chats[0]["last_msg_type"] == "sticker"
+
+            # 3. /api/media with types=sticker returns the sticker
+            stickers_resp = client.get("/api/media?chat_id=1&chat_type=contact&types=sticker")
+            assert stickers_resp.status_code == 200
+            stickers = stickers_resp.get_json()
+            assert len(stickers) == 1
+            assert stickers[0]["media_type"] == "sticker"
+
+            # 4. /api/media with types=image does NOT return the sticker
+            images_resp = client.get("/api/media?chat_id=1&chat_type=contact&types=image")
+            assert images_resp.status_code == 200
+            images = images_resp.get_json()
+            assert len(images) == 0
+
+            # 5. /api/media/count counts it as sticker
+            count_resp = client.get("/api/media/count?chat_id=1&chat_type=contact")
+            assert count_resp.status_code == 200
+            counts = count_resp.get_json()
+            assert counts["by_type"]["sticker"]["count"] == 1
+            assert counts["by_type"]["sticker"]["missing"] == 0
+
+    def test_android_sticker_classification_and_gallery(self, tmp_path):
+        wa_path = tmp_path / "msgstore.db"
+        archive_path_db = tmp_path / ".wa_media_archiver.db"
+        wa_conn = make_android_db(wa_path)
+        archive_conn = make_archive_db(archive_path_db)
+        seed_android_db(wa_conn, archive_conn)
+
+        wa_conn.execute(
+            "INSERT INTO message (_id, chat_row_id, from_me, sender_jid_row_id, timestamp, text_data, message_type) "
+            "VALUES (55, 10, 0, 1, 1700000055000, NULL, 20)"
+        )
+        wa_conn.execute(
+            "INSERT INTO message_media (message_row_id, file_path, media_name) "
+            "VALUES (55, 'Media/WhatsApp Stickers/STK-2026.webp', 'STK-2026.webp')"
+        )
+        wa_conn.commit()
+
+        archive_conn.execute(
+            "INSERT INTO archive_copies (original_path, archive_path) VALUES ('Media/WhatsApp Stickers/STK-2026.webp', 'Contacts/Alice/2026/STK-2026.webp')"
+        )
+        archive_conn.commit()
+        wa_conn.close()
+        archive_conn.close()
+
+        app = viewer.create_app(tmp_path, rescan=False)
+        with app.test_client() as client:
+            # 1. /api/messages classifies as sticker
+            resp = client.get("/api/messages?chat_id=123456789&chat_type=contact")
+            assert resp.status_code == 200
+            msgs = [m for m in resp.get_json() if m["msg_id"] == 55]
+            assert len(msgs) == 1
+            assert msgs[0]["media_type"] == "sticker"
+            assert msgs[0]["archive_path"] == "Contacts/Alice/2026/STK-2026.webp"
+
+            # 2. /api/media with types=sticker returns the sticker
+            stickers_resp = client.get(
+                "/api/media?chat_id=123456789&chat_type=contact&types=sticker"
+            )
+            assert stickers_resp.status_code == 200
+            stickers = stickers_resp.get_json()
+            assert len(stickers) == 1
+            assert stickers[0]["media_type"] == "sticker"
+
+            # 3. /api/media with types=image does NOT return the sticker
+            images_resp = client.get("/api/media?chat_id=123456789&chat_type=contact&types=image")
+            assert images_resp.status_code == 200
+            images = [img for img in images_resp.get_json() if img["msg_id"] == 55]
+            assert len(images) == 0
+
+            # 4. /api/media/count counts it as sticker
+            count_resp = client.get("/api/media/count?chat_id=123456789&chat_type=contact")
+            assert count_resp.status_code == 200
+            counts = count_resp.get_json()
+            assert counts["by_type"]["sticker"]["count"] == 1
+            assert counts["by_type"]["sticker"]["missing"] == 0
@@ -157,9 +157,15 @@ def test_all_media_types_present(self):
             "Media/WhatsApp Video Notes/%",
             "Media/WhatsApp Animated Gifs/%",
             "Media/WhatsApp Documents/%",
+            "Media/WhatsApp Stickers/%",
         ]:
             assert path in query, f"Missing from query: {path}"
 
+    def test_stickers_included(self):
+        query = android_handler.build_query(None, None, False)
+        assert query.count("Media/WhatsApp Stickers/%") == 2
+        assert "WhatsApp Stickers" in android_handler._MEDIA_SUBFOLDERS
+
     def test_limit_clause_included(self):
         query = android_handler.build_query(limit=100, since_ms=None, hd_dedup=False)
         assert "LIMIT 50" in query  # N//2 per block
@@ -271,6 +277,20 @@ def test_get_media_file_paths_hd_dedup(self):
         assert paths == {"Media/WhatsApp Images/hd.jpg"}
         conn.close()
 
+    def test_get_media_file_paths_includes_stickers(self):
+        conn = _make_msgstore()
+        conn.execute("INSERT INTO chat VALUES (1, NULL, 20)")
+        conn.execute("INSERT INTO jid VALUES (20, '123456')")
+        conn.execute("INSERT INTO message VALUES (1, 1000, 20, 0)")
+        conn.execute(
+            "INSERT INTO message_media VALUES ('Media/WhatsApp Stickers/STK-1.webp', 'image/webp', 1, 1, 'url', NULL)"
+        )
+        conn.commit()
+
+        paths = android_handler.get_media_file_paths(conn.cursor(), None, False)
+        assert "Media/WhatsApp Stickers/STK-1.webp" in paths
+        conn.close()
+
 
 # ===========================================================================
 # Schema validation (needs an in-memory SQLite DB)
@@ -1614,6 +1634,48 @@ def test_one_to_one_sent_routed_to_sent_folder(self, tmp_path, logger):
             os.path.join(out, "Contacts", "Alice (00111)", "2024", "Sent", "img.jpg")
         )
 
+    def test_sticker_archiving_group_and_contact(self, tmp_path, logger):
+        src_dir = tmp_path / "src"
+        stk_file = src_dir / "Media" / "WhatsApp Stickers" / "STK-20240115-WA0001.webp"
+        stk_file.parent.mkdir(parents=True, exist_ok=True)
+        stk_file.write_bytes(b"RIFF....WEBP")
+        out = str(tmp_path / "out")
+        os.makedirs(out)
+        rows = [
+            self._row(
+                file_path="Media/WhatsApp Stickers/STK-20240115-WA0001.webp",
+                chat_subject="Family",
+                sender="111",
+                key_from_me=0,
+            )
+        ]
+        stats, _, _, _ = wa.process_rows(
+            rows,
+            1,
+            {"111": "Alice"},
+            {},
+            {},
+            {},
+            self._resolver(src_dir),
+            out,
+            logger,
+            False,
+            None,
+            None,
+            False,
+            {},
+        )
+        assert stats["copied"] == 1
+        assert os.path.isfile(
+            os.path.join(
+                out,
+                "Groups",
+                "Family",
+                "2024",
+                "STK-20240115-WA0001_Alice.webp",
+            )
+        )
+
     def test_unknown_sender_falls_back_to_phone_number(self, tmp_path, logger):
         src_dir = self._setup_src(tmp_path)
         out = str(tmp_path / "out")
 
@@ -33,6 +33,7 @@
     "WhatsApp Video Notes",
     "WhatsApp Animated Gifs",
     "WhatsApp Documents",
+    "WhatsApp Stickers",
 }
 
 
@@ -228,6 +229,7 @@ def build_query(limit: int | None, since_ms: int | None, hd_dedup: bool) -> str:
             OR message_media.file_path LIKE 'Media/WhatsApp Video Notes/%'
             OR message_media.file_path LIKE 'Media/WhatsApp Animated Gifs/%'
             OR message_media.file_path LIKE 'Media/WhatsApp Documents/%'
+            OR message_media.file_path LIKE 'Media/WhatsApp Stickers/%'
         )
         AND chat.subject IS NOT NULL
         {since_clause}
@@ -263,6 +265,7 @@ def build_query(limit: int | None, since_ms: int | None, hd_dedup: bool) -> str:
             OR message_media.file_path LIKE 'Media/WhatsApp Video Notes/%'
             OR message_media.file_path LIKE 'Media/WhatsApp Animated Gifs/%'
             OR message_media.file_path LIKE 'Media/WhatsApp Documents/%'
+            OR message_media.file_path LIKE 'Media/WhatsApp Stickers/%'
         )
         AND chat.subject IS NULL
         {since_clause}
 
@@ -1177,7 +1177,11 @@ def _media_type_from_path(path: str) -> str:
     p = path.lower()
     if p.endswith(".vcf"):
         return "vcard"
-    if "sticker" in p or "stickers" in p:
+    if (
+        "sticker" in p
+        or "stickers" in p
+        or (os.path.basename(p).startswith("stk-") and (p.endswith(".webp") or p.endswith(".was")))
+    ):
         return "sticker"
     ext = os.path.splitext(p)[1]
     if ext in (".jpg", ".jpeg", ".png", ".webp", ".heic", ".heif"):
@@ -1705,6 +1709,7 @@ def _build_media_only(
         CASE
             WHEN m.ZMESSAGETYPE = 6 THEN 'service'
             WHEN m.ZMESSAGETYPE = 4 THEN 'vcard'
+            WHEN m.ZMESSAGETYPE = 15 THEN 'sticker'
             WHEN m.ZMESSAGETYPE IS NULL OR m.ZMESSAGETYPE = 0 THEN
                 CASE WHEN m.ZTEXT IS NOT NULL
                       AND (INSTR(LOWER(m.ZTEXT), 'http://') > 0
@@ -2683,6 +2688,7 @@ def get_cache():
         CASE
             WHEN m.ZMESSAGETYPE = 6 THEN 'service'
             WHEN m.ZMESSAGETYPE = 4 THEN 'vcard'
+            WHEN m.ZMESSAGETYPE = 15 THEN 'sticker'
             WHEN m.ZMESSAGETYPE IS NULL OR m.ZMESSAGETYPE = 0 THEN
                 CASE WHEN m.ZTEXT IS NOT NULL
                       AND (INSTR(LOWER(m.ZTEXT), 'http://') > 0
@@ -2826,6 +2832,7 @@ def get_cache():
         CASE
             WHEN m.message_type = 7 THEN 'service'
             WHEN m.message_type IN (4, 14) THEN 'vcard'
+            WHEN m.message_type = 20 THEN 'sticker'
             WHEN m.message_type IS NULL OR m.message_type = 0 THEN
                 CASE WHEN m.text_data IS NOT NULL
                       AND (INSTR(LOWER(m.text_data), 'http://') > 0
@@ -3212,6 +3219,10 @@ def api_chats():
                 source_type == "ios" and raw_type == 4
             ):
                 d["last_msg_type"] = "vcard"
+            elif (source_type == "android" and raw_type == 20) or (
+                source_type == "ios" and raw_type == 15
+            ):
+                d["last_msg_type"] = "sticker"
             elif raw_type != 0 and media_path:
                 path = media_path if source_type == "android" else f"Message/{media_path}"
                 d["last_msg_type"] = _media_type_from_path(path)
@@ -3510,6 +3521,13 @@ def api_media():
                             ext_conds.append("m.message_type IN (4, 14)")
                         else:
                             ext_conds.append("m.ZMESSAGETYPE = 4")
+                    if mt == "sticker":
+                        if source_type == "android":
+                            ext_conds.append(
+                                "(m.message_type = 20 OR mm.file_path LIKE '%sticker%')"
+                            )
+                        else:
+                            ext_conds.append("m.ZMESSAGETYPE = 15")
                 if ext_conds:
                     prune_sql = " OR ".join(ext_conds)
                     cand_clauses.append(