diff --git a/external/solanaceae_message3 b/external/solanaceae_message3
index c8e3e93..7f1a5ea 160000
--- a/external/solanaceae_message3
+++ b/external/solanaceae_message3
@@ -1 +1 @@
-Subproject commit c8e3e9374360fa241ccebd070e1d70abf6ba665b
+Subproject commit 7f1a5ea1d40a670e27ae27f54029353daa9eb5ac
diff --git a/src/tox_avatar_manager.cpp b/src/tox_avatar_manager.cpp
index a5d18c1..7404425 100644
--- a/src/tox_avatar_manager.cpp
+++ b/src/tox_avatar_manager.cpp
@@ -54,6 +54,7 @@ ToxAvatarManager::ToxAvatarManager(
 	{ // scan tox contacts for cached avatars
 		// old sts says pubkey.png
 
+#if 0
 		_cs.registry().view<Contact::Components::ToxFriendPersistent>().each([this](auto c, const Contact::Components::ToxFriendPersistent& tox_pers) {
 			// try
 			addAvatarFileToContact(c, tox_pers.key);
@@ -63,6 +64,13 @@ ToxAvatarManager::ToxAvatarManager(
 			// try
 			addAvatarFileToContact(c, tox_pers.chat_id);
 		});
+#else
+		// HACK: assumed id is pubkey
+		_cs.registry().view<Contact::Components::ID>().each([this](auto c, const Contact::Components::ID& id) {
+			// try
+			addAvatarFileToContact(c, id.data);
+		});
+#endif
 
 		// TODO: also for group peers?
 		// TODO: conf?
diff --git a/src/tox_avatar_manager.hpp b/src/tox_avatar_manager.hpp
index 1e4b2f1..0c13119 100644
--- a/src/tox_avatar_manager.hpp
+++ b/src/tox_avatar_manager.hpp
@@ -2,7 +2,6 @@
 
 #include <solanaceae/object_store/object_store.hpp>
 #include <solanaceae/contact/fwd.hpp>
-#include <solanaceae/tox_contacts/tox_contact_model2.hpp>
 
 #include "./backends/std_fs.hpp"