diff --git a/my/config.py b/my/config.py
index 5102b6e..8d958f1 100644
--- a/my/config.py
+++ b/my/config.py
@@ -261,5 +261,7 @@ class roamresearch:
     username: str
 
 
-
-
+class whatsapp:
+    class android:
+        export_path: Paths
+        my_user_id: Optional[str]
diff --git a/my/whatsapp/android.py b/my/whatsapp/android.py
new file mode 100644
index 0000000..fbccbf5
--- /dev/null
+++ b/my/whatsapp/android.py
@@ -0,0 +1,164 @@
+"""
+Whatsapp data from Android app database (in =/data/data/com.whatsapp/databases/msgstore.db=)
+"""
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import datetime, timezone
+from pathlib import Path
+import sqlite3
+from typing import Sequence, Iterator, Optional
+
+from more_itertools import unique_everseen
+
+from my.core import get_files, Paths, datetime_aware, Res, LazyLogger, make_config
+from my.core.error import echain, notnone
+from my.core.sqlite import sqlite_connection
+
+
+from my.config import whatsapp as user_config
+
+
+logger = LazyLogger(__name__)
+
+
+@dataclass
+class Config(user_config.android):
+    # paths[s]/glob to the exported sqlite databases
+    export_path: Paths
+    my_user_id: Optional[str] = None
+
+
+config = make_config(Config)
+
+
+def inputs() -> Sequence[Path]:
+    return get_files(config.export_path)
+
+
+@dataclass(unsafe_hash=True)
+class Chat:
+    id: str
+    # todo not sure how to support renames?
+    # could change Chat object itself, but this won't work well with incremental processing..
+    name: Optional[str]
+
+
+@dataclass(unsafe_hash=True)
+class Sender:
+    id: str
+    name: Optional[str]
+
+
+@dataclass(unsafe_hash=True)
+class Message:
+    chat: Chat
+    id: str
+    dt: datetime_aware
+    sender: Sender
+    text: Optional[str]
+
+
+def _process_db(db: sqlite3.Connection):
+    # TODO later, split out Chat/Sender objects separately to safe on object creation, similar to other android data sources
+
+    chats = {}
+    for r in db.execute('''
+    SELECT raw_string_jid AS chat_id, subject
+    FROM chat_view
+    WHERE chat_id IS NOT NULL /* seems that it might be null for chats that are 'recycled' (the db is more like an LRU cache) */
+    '''):
+        chat_id = r['chat_id']
+        subject = r['subject']
+        chat = Chat(
+            id=chat_id,
+            name=subject,
+        )
+        chats[chat.id] = chat
+
+
+    senders = {}
+    for r in db.execute('''
+    SELECT _id, raw_string
+    FROM jid
+    '''):
+        # TODO seems that msgstore.db doesn't have contact names
+        # perhaps should extract from wa.db and match against wa_contacts.jid?
+        s = Sender(
+            id=r['raw_string'],
+            name=None,
+        )
+        senders[r['_id']] = s
+
+
+    # todo message_type? mostly 0, but seems all over, even for seemingly normal messages with text
+    for r in db.execute('''
+    SELECT C.raw_string_jid AS chat_id, M.key_id, M.timestamp, sender_jid_row_id, M.from_me, M.text_data, MM.file_path
+    FROM message AS M
+    LEFT JOIN chat_view AS C
+    ON M.chat_row_id = C._id
+    LEFT JOIN message_media AS MM
+    ON M._id = MM.message_row_id
+    WHERE M.key_id != -1 /*  key_id -1 is some sort of fake message where everything is null */
+    ORDER BY M.timestamp
+    '''):
+        msg_id: str = notnone(r['key_id'])
+        ts: int = notnone(r['timestamp'])
+        dt = datetime.fromtimestamp(ts / 1000, tz=timezone.utc)
+
+        text: Optional[str] = r['text_data']
+        media_file_path: Optional[str] = r['file_path']
+
+        if media_file_path is not None:
+            mm = f'MEDIA: {media_file_path}'
+            if text is None:
+                text = mm
+            else:
+                text = text + '\n' + mm
+
+        from_me = r['from_me'] == 1
+
+        chat_id = r['chat_id']
+        if chat_id is None:
+            # ugh, I think these might have been edited messages? unclear..
+            logger.warning(f"CHAT ID IS NONE, WTF?? {dt} {ts} {text}")
+            continue
+        chat = chats[chat_id]
+
+        sender_row_id = r['sender_jid_row_id']
+        if sender_row_id == 0:
+            # seems that it's always 0 for 1-1 chats
+            # for group chats our onw id is still 0, but other ids are properly set
+            if from_me:
+                myself_user_id = config.my_user_id or 'MYSELF_USER_ID'
+                sender = Sender(id=myself_user_id, name=None)
+            else:
+                sender = Sender(id=chat.id, name=None)
+        else:
+            sender = senders[sender_row_id]
+
+
+
+        m = Message(
+            chat=chat,
+            id=msg_id,
+            dt=dt,
+            sender=sender,
+            text=text
+        )
+        yield m
+
+
+def _messages() -> Iterator[Res[Message]]:
+    dbs = inputs()
+    for i, f in enumerate(dbs):
+        logger.debug(f'processing {f} {i}/{len(dbs)}')
+        with sqlite_connection(f, immutable=True, row_factory='row') as db:
+            try:
+                yield from _process_db(db)
+            except Exception as e:
+                yield echain(RuntimeError(f'While processing {f}'), cause=e)
+
+
+def messages() -> Iterator[Res[Message]]:
+    yield from unique_everseen(_messages())