diff --git a/LIBCWTCH-GO.version b/LIBCWTCH-GO.version
index 925b0be..4f89ec5 100644
--- a/LIBCWTCH-GO.version
+++ b/LIBCWTCH-GO.version
@@ -1 +1 @@
-v0.0.2-30-g2788c06-2021-05-18-20-00
\ No newline at end of file
+v0.0.2-36-g84d85b7-2021-05-20-01-14
\ No newline at end of file
diff --git a/cwtch.png b/cwtch.png
new file mode 100644
index 0000000..148b91a
Binary files /dev/null and b/cwtch.png differ
diff --git a/lib/views/contactsview.dart b/lib/views/contactsview.dart
index 3acef72..cfd6cb9 100644
--- a/lib/views/contactsview.dart
+++ b/lib/views/contactsview.dart
@@ -85,7 +85,7 @@ class _ContactsViewState extends State<ContactsView> {
 
   Widget _buildContactList() {
     final tiles = Provider.of<ContactListState>(context).filteredList().map((ContactInfoState contact) {
-      return ChangeNotifierProvider<ContactInfoState>.value(key: ValueKey(contact.onion), value: contact, builder: (_, __) => ContactRow());
+      return ChangeNotifierProvider<ContactInfoState>.value(key: ValueKey(contact.profileOnion+""+contact.onion), value: contact, builder: (_, __) => ContactRow());
     });
     final divided = ListTile.divideTiles(
       context: context,
diff --git a/lib/widgets/contactrow.dart b/lib/widgets/contactrow.dart
index 8a8ffe1..8211dc7 100644
--- a/lib/widgets/contactrow.dart
+++ b/lib/widgets/contactrow.dart
@@ -88,15 +88,17 @@ class _ContactRowState extends State<ContactRow> {
 
   void _pushMessageView(String handle) {
     Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(handle).unreadMessages = 0;
+    var profileOnion = Provider.of<ProfileInfoState>(context, listen: false).onion;
     Navigator.of(context).push(
       MaterialPageRoute<void>(
         builder: (BuildContext builderContext) {
+          var profile = Provider.of<FlwtchState>(builderContext, listen: false).profs.getProfile(profileOnion);
           return MultiProvider(
             providers: [
-              ChangeNotifierProvider.value(value: Provider.of<ProfileInfoState>(context)),
-              ChangeNotifierProvider.value(value: Provider.of<ProfileInfoState>(context).contactList.getContact(handle)),
+              ChangeNotifierProvider.value(value: profile),
+              ChangeNotifierProvider.value(value: profile.contactList.getContact(handle)),
             ],
-            child: MessageView(),
+            builder:(context, child) =>  MessageView(),
           );
         },
       ),
diff --git a/pubspec.lock b/pubspec.lock
index 5f51869..8c01490 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -14,7 +14,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.0"
+    version: "2.6.1"
   boolean_selector:
     dependency: transitive
     description: