diff --git a/api/src/main/java/com/readrops/api/services/fever/adapters/FeverItemsAdapter.kt b/api/src/main/java/com/readrops/api/services/fever/adapters/FeverItemsAdapter.kt
index 25be60f4..8290c1ab 100644
--- a/api/src/main/java/com/readrops/api/services/fever/adapters/FeverItemsAdapter.kt
+++ b/api/src/main/java/com/readrops/api/services/fever/adapters/FeverItemsAdapter.kt
@@ -40,13 +40,14 @@ class FeverItemsAdapter {
                     with(item) {
                         when (selectName(NAMES)) {
                             0 -> remoteId = nextNonEmptyString()
-                            1 -> feedRemoteId = nextInt().toString()
+                            1 -> feedRemoteId = nextNonEmptyString()
                             2 -> title = nextNonEmptyString()
                             3 -> author = nextNullableString()
                             4 -> content = nextNullableString()
                             5 -> link = nextNullableString()
                             6 -> isRead = nextInt().toBoolean()
-                            7 -> pubDate = LocalDateTime(nextLong() * 1000L)
+                            7 -> isStarred = nextInt().toBoolean()
+                            8 -> pubDate = LocalDateTime(nextLong() * 1000L)
                             else -> skipValue()
                         }
                     }
@@ -68,7 +69,7 @@ class FeverItemsAdapter {
     companion object {
         val NAMES: JsonReader.Options = JsonReader.Options.of(
             "id", "feed_id", "title", "author", "html", "url",
-            "is_read", "created_on_time"
+            "is_read", "is_saved", "created_on_time"
         )
     }
 }
\ No newline at end of file
diff --git a/api/src/test/java/com/readrops/api/services/fever/adapters/FeverItemsAdapterTest.kt b/api/src/test/java/com/readrops/api/services/fever/adapters/FeverItemsAdapterTest.kt
index 42e1cff4..05d82da0 100644
--- a/api/src/test/java/com/readrops/api/services/fever/adapters/FeverItemsAdapterTest.kt
+++ b/api/src/test/java/com/readrops/api/services/fever/adapters/FeverItemsAdapterTest.kt
@@ -8,6 +8,7 @@ import okio.Buffer
 import org.junit.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
 
 class FeverItemsAdapterTest {
 
@@ -27,7 +28,8 @@ class FeverItemsAdapterTest {
             assertEquals(author, "Alkarex")
             assertEquals(link, "https://github.com/FreshRSS/FreshRSS/releases/tag/1.9.0")
             assertNotNull(content)
-            assertEquals(isRead, true)
+            assertTrue(isStarred)
+            assertTrue(isRead)
             assertNotNull(pubDate)
             assertEquals(remoteId, "1546007484154894")
             assertEquals(feedRemoteId, "2")
diff --git a/api/src/test/resources/services/fever/items.json b/api/src/test/resources/services/fever/items.json
index 1dc2e138..9c41bdc2 100644
--- a/api/src/test/resources/services/fever/items.json
+++ b/api/src/test/resources/services/fever/items.json
@@ -11,7 +11,7 @@
       "author": "Alkarex",
       "html": "\n<ul>\n<li><a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/milestones\/1.9.0\">Milestone<\/a><\/li>\n<li><a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1720\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1720\/hovercard\">Discussion<\/a><\/li>\n<\/ul>\n<p><a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/blob\/1.9.0\/CHANGELOG.md\">Changelog<\/a>:<\/p>\n<ul>\n<li>Features\n<ul>\n<li>Share with Mastodon <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/issues\/1521\" data-hovercard-type=\"issue\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/issues\/1521\/hovercard\">#1521<\/a>\n<\/li>\n<\/ul>\n<\/li>\n<li>UI\n<ul>\n<li>Add more Unicode glyphs in the Open Sans font <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1032\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1032\/hovercard\">#1032<\/a>\n<\/li>\n<li>Show URL to add subscriptions from third-party tools <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/issues\/1247\" data-hovercard-type=\"issue\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/issues\/1247\/hovercard\">#1247<\/a>\n<\/li>\n<li>Improved message when checking for new versions <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/issues\/1586\" data-hovercard-type=\"issue\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/issues\/1586\/hovercard\">#1586<\/a>\n<\/li>\n<\/ul>\n<\/li>\n<li>SimplePie\n<ul>\n<li>Remove \"SimplePie\" name from HTTP User-Agent string <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1656\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1656\/hovercard\">#1656<\/a>\n<\/li>\n<\/ul>\n<\/li>\n<li>Bug fixing\n<ul>\n<li>Work-around for PHP 5.6.0- <code>CURLOPT_FOLLOWLOCATION<\/code> <code>open_basedir<\/code> bug in favicons and PubSubHubbub <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/issues\/1655\" data-hovercard-type=\"issue\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/issues\/1655\/hovercard\">#1655<\/a>\n<\/li>\n<li>Fix PDO PostgreSQL detection <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/issues\/1690\" data-hovercard-type=\"issue\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/issues\/1690\/hovercard\">#1690<\/a>\n<\/li>\n<li>Fix punycode warning in PHP 7.2 <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/issues\/1699\" data-hovercard-type=\"issue\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/issues\/1699\/hovercard\">#1699<\/a>\n<\/li>\n<li>Fix crash when adding a new category while adding a new feed <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1731\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1731\/hovercard\">#1731<\/a>\n<\/li>\n<li>Fix ExtensionManager exception handling <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1724\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1724\/hovercard\">#1724<\/a>\n<\/li>\n<\/ul>\n<\/li>\n<li>CLI\n<ul>\n<li>New command <code>.\/cli\/db-optimize.php<\/code> for database optimisation <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/issues\/1583\" data-hovercard-type=\"issue\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/issues\/1583\/hovercard\">#1583<\/a>\n<\/li>\n<li>Check PHP requirements before running <code>actualize_script.php<\/code> (cron for refreshing feeds) <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1711\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1711\/hovercard\">#1711<\/a>\n<\/li>\n<\/ul>\n<\/li>\n<li>SQL\n<ul>\n<li>Perform <code>VACUUM<\/code> on SQLite and PostgreSQL databases when optimisation is requested <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/issues\/918\" data-hovercard-type=\"issue\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/issues\/918\/hovercard\">#918<\/a>\n<\/li>\n<\/ul>\n<\/li>\n<li>API\n<ul>\n<li>Breaking change \/ compatibility fix (EasyRSS): Provide <code>link<\/code> to articles without HTML-encoding <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/issues\/1683\" data-hovercard-type=\"issue\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/issues\/1683\/hovercard\">#1683<\/a>\n<\/li>\n<\/ul>\n<\/li>\n<li>Extensions\n<ul>\n<li>Breaking change: uppercase <code>.\/Controllers\/<\/code> directory <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1729\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1729\/hovercard\">#1729<\/a>\n<\/li>\n<li>Show existing extensions in admin panel <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1708\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1708\/hovercard\">#1708<\/a>\n<\/li>\n<li>New function <code>$entry-&gt;_hash($hex)<\/code> for extensions that change the content of entries <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1707\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1707\/hovercard\">#1707<\/a>\n<\/li>\n<\/ul>\n<\/li>\n<li>I18n\n<ul>\n<li>Hebrew <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1716\">#1716<\/a>\n<\/li>\n<li>Improved German <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1698\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1698\/hovercard\">#1698<\/a>\n<\/li>\n<\/ul>\n<\/li>\n<li>Misc.\n<ul>\n<li>Customisable <code>constants.local.php<\/code> <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1725\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1725\/hovercard\">#1725<\/a>\n<\/li>\n<li>Basic mechanism to limit the size of the logs <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1712\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1712\/hovercard\">#1712<\/a>\n<\/li>\n<li>Translation validation tool <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1653\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1653\/hovercard\">#1653<\/a>\n<\/li>\n<li>Translation manipulation tool <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1658\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1658\/hovercard\">#1658<\/a>\n<\/li>\n<li>Improved documentation <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1697\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1697\/hovercard\">#1697<\/a>, <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1704\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1704\/hovercard\">#1704<\/a>\n<\/li>\n<li>New <code>.editorconfig<\/code> file <a href=\"https:\/\/github.com\/FreshRSS\/FreshRSS\/pull\/1732\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"\/FreshRSS\/FreshRSS\/pull\/1732\/hovercard\">#1732<\/a>\n<\/li>\n<\/ul>\n<\/li>\n<\/ul>\n",
       "url": "https:\/\/github.com\/FreshRSS\/FreshRSS\/releases\/tag\/1.9.0",
-      "is_saved": 0,
+      "is_saved": 1,
       "is_read": 1,
       "created_on_time": 1515697500
     }
diff --git a/app/src/main/java/com/readrops/app/repositories/FeverRepository.kt b/app/src/main/java/com/readrops/app/repositories/FeverRepository.kt
index 193296a0..ed8dfa0d 100644
--- a/app/src/main/java/com/readrops/app/repositories/FeverRepository.kt
+++ b/app/src/main/java/com/readrops/app/repositories/FeverRepository.kt
@@ -1,6 +1,7 @@
 package com.readrops.app.repositories
 
 import android.content.Context
+import android.util.Log
 import com.readrops.api.services.SyncType
 import com.readrops.api.services.fever.FeverDataSource
 import com.readrops.api.services.fever.adapters.FeverFeeds
@@ -39,6 +40,7 @@ class FeverRepository(
                         .doOnSuccess { account.id = it.toInt() }
                         .await()
             } catch (e: Exception) {
+                Log.e(TAG, "login: ${e.message}")
                 error(e.message!!)
             }
         }
@@ -65,9 +67,10 @@ class FeverRepository(
                 insertFolders(syncResult.folders)
                 insertFeeds(syncResult.feverFeeds)
 
-                //insertItems(syncResult.items)
-                //insertItemsIds(syncResult.unreadIds!!, syncResult.starredIds!!.toMutableList())
+                insertItems(syncResult.items)
+                insertItemsIds(syncResult.unreadIds, syncResult.starredIds.toMutableList())
             } catch (e: Exception) {
+                Log.e(TAG, "sync: ${e.message}")
                 error(e.message!!)
             }
         }
@@ -94,10 +97,60 @@ class FeverRepository(
     }
 
     private fun insertItems(items: List<Item>) {
+        val itemsToInsert = arrayListOf<Item>()
+        val itemsFeedsIds = mutableMapOf<String, Int>()
 
+        for (item in items) {
+            var feedId: Int?
+            if (itemsFeedsIds.containsKey(item.feedRemoteId)) {
+                feedId = itemsFeedsIds[item.feedRemoteId]
+            } else {
+                feedId = database.feedDao().getFeedIdByRemoteId(item.feedRemoteId!!, account.id)
+                itemsFeedsIds[item.feedRemoteId!!] = feedId
+            }
+
+            item.feedId = feedId!!
+            item.text?.let { item.readTime = Utils.readTimeFromString(it) }
+
+            itemsToInsert += item
+        }
+
+        if (itemsToInsert.isNotEmpty()) {
+            itemsToInsert.sortWith(Item::compareTo)
+            database.itemDao().insert(itemsToInsert)
+        }
     }
 
-    private fun insertItemsIds(unreadIds: List<String>, starredIds: List<String>) {
+    private fun insertItemsIds(unreadIds: List<String>, starredIds: MutableList<String>) {
+        database.itemStateDao().deleteItemsStates(account.id)
 
+        database.itemStateDao().insertItemStates(unreadIds.map { unreadId ->
+            val starred = starredIds.any { starredId -> starredId == unreadId }
+            if (starred) starredIds.remove(unreadId)
+
+            ItemState(
+                    id = 0,
+                    read = false,
+                    starred = starred,
+                    remoteId = unreadId,
+                    accountId = account.id,
+            )
+        })
+
+        if (starredIds.isNotEmpty()) {
+            database.itemStateDao().insertItemStates(starredIds.map { starredId ->
+                ItemState(
+                        id = 0,
+                        read = true, // if this id wasn't in the unread ids list, it is considered a read
+                        starred = true,
+                        remoteId = starredId,
+                        accountId = account.id,
+                )
+            })
+        }
+    }
+
+    companion object {
+        val TAG: String = FeverRepository::class.java.simpleName
     }
 }
\ No newline at end of file