diff --git a/src/core/ObservableList.vala b/src/core/ObservableList.vala
index 0be22fa..48310c8 100644
--- a/src/core/ObservableList.vala
+++ b/src/core/ObservableList.vala
@@ -23,6 +23,7 @@ namespace Venom {
   public class ObservableList : GLib.Object {
     public signal void added(GLib.Object item, uint index);
     public signal void removed(GLib.Object item, uint index);
+    public signal void changed();
 
     private Gee.List<GLib.Object> list = new Gee.ArrayList<GLib.Object>();
 
@@ -44,12 +45,14 @@ namespace Venom {
       var idx = list.size;
       list.add(item);
       added(item, idx);
+      changed();
     }
 
     public void remove(GLib.Object item) {
       var idx = list.index_of(item);
       removed(item, idx);
       list.remove_at(idx);
+      changed();
     }
 
     public uint length() {
diff --git a/src/meson.build b/src/meson.build
index 955b2a9..4990a3f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -69,6 +69,7 @@ venom_source = files(
 			'view/AddContactWidget.vala',
 			'view/ApplicationWindow.vala',
 			'view/ConferenceInfoWidget.vala',
+			'view/ConferenceInviteEntry.vala',
 			'view/ConferenceWindow.vala',
 			'view/ContactListEntry.vala',
 			'view/ContactListRequestEntry.vala',
diff --git a/src/testing/mocks/MockToxSession.vala b/src/testing/mocks/MockToxSession.vala
index cfa86f5..f4679c8 100644
--- a/src/testing/mocks/MockToxSession.vala
+++ b/src/testing/mocks/MockToxSession.vala
@@ -148,6 +148,13 @@ namespace Mock {
                      .create();
       mock().actual_call(this, "conference_invite", args).get_throws();
     }
+    public void conference_join(uint32 friend_number, ConferenceType type, uint8[] cookie) throws ToxError {
+      var args = Arguments.builder()
+                     .uint(friend_number)
+                     .int(type)
+                     .create();
+      mock().actual_call(this, "conference_join", args).get_throws();
+    }
     public void conference_send_message(uint32 conference_number, string message) throws ToxError {
       var args = Arguments.builder()
                      .uint(conference_number)
diff --git a/src/tox/FriendRequest.vala b/src/tox/FriendRequest.vala
index e3d6500..c4ba4c0 100644
--- a/src/tox/FriendRequest.vala
+++ b/src/tox/FriendRequest.vala
@@ -20,30 +20,27 @@
  */
 
 namespace Venom {
-  public class FriendRequest : IContact, GLib.Object {
-    private string id;
-    private string message;
+  public class FriendRequest : GLib.Object {
+    public string id { get; set; }
+    public string message { get; set; }
+
     public FriendRequest(string id, string message) {
       this.id = id;
       this.message = message;
     }
-    public string get_id() {
-      return id;
-    }
-    public string get_name_string() {
-      return _("Friend request");
+  }
+
+  public class ConferenceInvite : GLib.Object {
+    public IContact sender { get; set; }
+    public ConferenceType conference_type { get; set; }
+    public uint8[] get_cookie() {
+      return cookie;
     }
-    public string get_status_string() {
-      return message;
+    private uint8[] cookie;
+    public ConferenceInvite(IContact sender, ConferenceType conference_type, uint8[] cookie) {
+      this.sender = sender;
+      this.conference_type = conference_type;
+      this.cookie = cookie;
     }
-    public UserStatus get_status() { return UserStatus.NONE; }
-    public bool is_connected() { return false; }
-    public Gdk.Pixbuf get_image() { return null; }
-    public bool get_requires_attention() { return true; }
-    public void clear_attention() {}
-    public bool is_typing() { return false; }
-    public bool show_notifications() { return true; }
-    public bool is_conference() { return false; }
   }
-
 }
diff --git a/src/tox/ToxAdapterConferenceListener.vala b/src/tox/ToxAdapterConferenceListener.vala
index 33c96d2..eaed165 100644
--- a/src/tox/ToxAdapterConferenceListener.vala
+++ b/src/tox/ToxAdapterConferenceListener.vala
@@ -20,19 +20,22 @@
  */
 
 namespace Venom {
-  public class ToxAdapterConferenceListenerImpl : ToxAdapterConferenceListener, ConferenceWidgetListener, ConferenceInfoWidgetListener, CreateGroupchatWidgetListener, GLib.Object {
+  public class ToxAdapterConferenceListenerImpl : ToxAdapterConferenceListener, ConferenceInviteEntryListener, ConferenceWidgetListener, ConferenceInfoWidgetListener, CreateGroupchatWidgetListener, GLib.Object {
     private unowned ToxSession session;
     private ILogger logger;
     private ObservableList contacts;
+    private ObservableList conference_invites;
     private NotificationListener notification_listener;
     private GLib.HashTable<IContact, ObservableList> conversations;
 
     private GLib.HashTable<uint32, IContact> conferences;
+    private unowned GLib.HashTable<uint32, IContact> friends;
 
-    public ToxAdapterConferenceListenerImpl(ILogger logger, ObservableList contacts, GLib.HashTable<IContact, ObservableList> conversations, NotificationListener notification_listener) {
+    public ToxAdapterConferenceListenerImpl(ILogger logger, ObservableList contacts, ObservableList conference_invites, GLib.HashTable<IContact, ObservableList> conversations, NotificationListener notification_listener) {
       logger.d("ToxAdapterConferenceListenerImpl created.");
       this.logger = logger;
       this.contacts = contacts;
+      this.conference_invites = conference_invites;
       this.conversations = conversations;
       this.notification_listener = notification_listener;
 
@@ -46,6 +49,7 @@ namespace Venom {
     public virtual void attach_to_session(ToxSession session) {
       this.session = session;
       session.set_conference_listener(this);
+      friends = session.get_friends();
     }
 
     public virtual void on_remove_conference(IContact c) throws Error {
@@ -63,12 +67,12 @@ namespace Venom {
       session.conference_send_message(conference.conference_number, message);
     }
 
-    public virtual void on_create_groupchat(string title, GroupchatType type) throws Error {
+    public virtual void on_create_groupchat(string title, ConferenceType type) throws Error {
       session.conference_new(title);
     }
 
-    public virtual void on_conference_invite(IContact c, string id) throws Error {
-      logger.d("on_conference_invite");
+    public virtual void on_send_conference_invite(IContact c, string id) throws Error {
+      logger.d("on_send_conference_invite");
       if (c is Contact) {
         var contact = c as Contact;
         if (id == "") {
@@ -84,6 +88,49 @@ namespace Venom {
       }
     }
 
+    public virtual void on_accept_conference_invite(ConferenceInvite invite) throws Error {
+      var c = invite.sender as Contact;
+      session.conference_join(c.tox_friend_number, invite.conference_type, invite.get_cookie());
+      conference_invites.remove(invite);
+    }
+
+    public virtual void on_reject_conference_invite(ConferenceInvite invite) throws Error {
+      conference_invites.remove(invite);
+    }
+
+    private bool invite_equals(ConferenceInvite invite, uint32 friend_number, ConferenceType type, uint8[] cookie) {
+      var cmp_sender = invite.sender as Contact;
+      var cmp_cookie = invite.get_cookie();
+      return (cmp_sender.tox_friend_number == friend_number
+              && invite.conference_type == type
+              && cmp_cookie.length == cookie.length
+              && Memory.cmp(cookie, cmp_cookie, cookie.length) == 0);
+    }
+
+    public virtual void on_conference_invite_received(uint32 friend_number, ConferenceType type, uint8[] cookie) {
+      logger.d("on_conference_invite_received");
+
+      if (friend_number == uint32.MAX) {
+        session.conference_join(friend_number, type, cookie);
+      } else {
+        for (var i = 0; i < conference_invites.length(); i++) {
+          var invite = conference_invites.nth_data(i) as ConferenceInvite;
+          if (invite_equals(invite, friend_number, type, cookie)) {
+            logger.d("duplicate invite received, discarding");
+            return;
+          }
+        }
+
+        var contact = friends.@get(friend_number) as Contact;
+        if (contact.auto_conference) {
+          session.conference_join(friend_number, type, cookie);
+        } else {
+          var invite = new ConferenceInvite(contact, type, cookie);
+          conference_invites.append(invite);
+        }
+      }
+    }
+
     public virtual void on_conference_new(uint32 conference_number, string title) {
       logger.d("on_conference_new");
       var contact = new Conference(conference_number, title);
diff --git a/src/tox/ToxAdapterFriendListener.vala b/src/tox/ToxAdapterFriendListener.vala
index 4c5726b..75b535c 100644
--- a/src/tox/ToxAdapterFriendListener.vala
+++ b/src/tox/ToxAdapterFriendListener.vala
@@ -29,20 +29,21 @@ namespace Venom {
     private GLib.HashTable<uint32, Message> messages_waiting_for_rr;
 
     private unowned GLib.HashTable<uint32, IContact> friends;
-    private GLib.HashTable<string, IContact> friend_requests;
+    private Gee.Map<string, FriendRequest> tox_friend_requests;
+    private ObservableList friend_requests;
 
     public bool show_typing { get; set; }
 
-    public ToxAdapterFriendListenerImpl(ILogger logger, ObservableList contacts, GLib.HashTable<IContact, ObservableList> conversations, NotificationListener notification_listener) {
+    public ToxAdapterFriendListenerImpl(ILogger logger, ObservableList contacts, ObservableList friend_requests, GLib.HashTable<IContact, ObservableList> conversations, NotificationListener notification_listener) {
       logger.d("ToxAdapterFriendListenerImpl created.");
       this.logger = logger;
       this.contacts = contacts;
+      this.friend_requests = friend_requests;
       this.conversations = conversations;
       this.notification_listener = notification_listener;
 
       messages_waiting_for_rr = new GLib.HashTable<uint32, Message>(null, null);
-
-      friend_requests = new GLib.HashTable<string, IContact>(str_hash, str_equal);
+      tox_friend_requests = new Gee.HashMap<string, FriendRequest>();
     }
 
     ~ToxAdapterFriendListenerImpl() {
@@ -75,17 +76,19 @@ namespace Venom {
     }
 
     public virtual void on_accept_friend_request(string id) throws Error {
-      var friend_request = friend_requests.@get(id);
+      var friend_request = tox_friend_requests.@get(id);
       var public_key = Tools.hexstring_to_bin(id);
       session.friend_add_norequest(public_key);
-      friend_requests.remove(id);
-      contacts.remove(friend_request);
+
+      friend_requests.remove(friend_request);
+      tox_friend_requests.remove(id);
     }
 
     public virtual void on_reject_friend_request(string id) throws Error {
-      var friend_request = friend_requests.@get(id);
-      friend_requests.remove(id);
-      contacts.remove(friend_request);
+      var friend_request = tox_friend_requests.@get(id);
+
+      friend_requests.remove(friend_request);
+      tox_friend_requests.remove(id);
     }
 
     public virtual void on_send_message(IContact c, string message) throws Error {
@@ -148,10 +151,10 @@ namespace Venom {
 
     public virtual void on_friend_request(uint8[] public_key, string message) {
       logger.d("on_friend_request");
-      var str_id = Tools.bin_to_hexstring(public_key);
-      var contact = new FriendRequest(str_id, message);
-      contacts.append(contact);
-      friend_requests.@set(str_id, contact);
+      var id = Tools.bin_to_hexstring(public_key);
+      var request = new FriendRequest(id, message);
+      friend_requests.append(request);
+      tox_friend_requests.@set(id, request);
     }
 
     public virtual void on_friend_status_changed(uint32 friend_number, UserStatus status) {
diff --git a/src/tox/ToxSession.vala b/src/tox/ToxSession.vala
index b7ca9a1..da160e4 100644
--- a/src/tox/ToxSession.vala
+++ b/src/tox/ToxSession.vala
@@ -26,6 +26,11 @@ namespace Venom {
     GENERIC
   }
 
+  public enum ConferenceType {
+    TEXT,
+    AV
+  }
+
   public class ToxConferencePeer : GLib.Object {
     public uint32 peer_number;
     public string? peer_name;
@@ -73,6 +78,7 @@ namespace Venom {
     public abstract uint32 conference_new(string title) throws ToxError;
     public abstract void conference_delete(uint32 conference_number) throws ToxError;
     public abstract void conference_invite(uint32 friend_number, uint32 conference_number) throws ToxError;
+    public abstract void conference_join(uint32 friend_number, ConferenceType type, uint8[] cookie) throws ToxError;
 
     public abstract void conference_send_message(uint32 conference_number, string message) throws ToxError;
     public abstract void conference_set_title(uint32 conference_number, string title) throws ToxError;
@@ -108,6 +114,7 @@ namespace Venom {
   public interface ToxAdapterConferenceListener : GLib.Object {
     public abstract void on_conference_new(uint32 conference_number, string title);
     public abstract void on_conference_deleted(uint32 conference_number);
+    public abstract void on_conference_invite_received(uint32 friend_number, Venom.ConferenceType type, uint8[] cookie);
 
     public abstract void on_conference_title_changed(uint32 conference_number, uint32 peer_number, string title);
     public abstract void on_conference_peer_list_changed(uint32 conference_number, ToxConferencePeer[] peers);
@@ -419,27 +426,12 @@ namespace Venom {
       Idle.add(() => { session.conference_listener.on_conference_title_changed(conference_number, peer_number, title_str); return false; });
     }
 
-    private static void on_conference_invite_cb(Tox self, uint32 friend_number, ConferenceType type, uint8[] cookie, void *user_data) {
+    private static void on_conference_invite_cb(Tox self, uint32 friend_number, ToxCore.ConferenceType type, uint8[] cookie, void *user_data) {
       var session = (ToxSessionImpl) user_data;
       session.logger.d("on_conference_invite_cb type:" + type.to_string());
-      if (type == ConferenceType.TEXT) {
-        var err = ErrConferenceJoin.OK;
-        var conference_number = self.conference_join(friend_number, cookie, out err);
-        if (err != ErrConferenceJoin.OK) {
-          session.logger.e("Conference join failed: " + err.to_string());
-          return;
-        }
-        Idle.add(() => { session.conference_listener.on_conference_new(conference_number, ""); return false; });
-      } else if (type == ConferenceType.AV) {
-        var conference_number = ToxAV.ToxAV.join_av_groupchat(self, friend_number, cookie, session.on_av_conference_audio_frame);
-        if (conference_number < 0) {
-          session.logger.e(@"Conference AV join failed: $conference_number");
-          return;
-        }
-        Idle.add(() => { session.conference_listener.on_conference_new(conference_number, ""); return false; });
-      } else {
-        session.logger.e("Conference join failed: Invalid Conference Type");
-      }
+      var gc_type = (type == ToxCore.ConferenceType.AV) ? ConferenceType.AV : ConferenceType.TEXT;
+      var cookie_copy = copy_data(cookie, cookie.length);
+      Idle.add(() => { session.conference_listener.on_conference_invite_received(friend_number, gc_type, cookie_copy); return false; });
     }
 
     private void on_av_conference_audio_frame() {
@@ -774,6 +766,30 @@ namespace Venom {
       return conference_number;
     }
 
+    public virtual void conference_join(uint32 friend_number, ConferenceType type, uint8[] cookie) throws ToxError {
+      uint32 conference_number;
+      switch (type) {
+        case ConferenceType.AV:
+          conference_number = ToxAV.ToxAV.join_av_groupchat(handle, friend_number, cookie, on_av_conference_audio_frame);
+          if (conference_number < 0) {
+            var message = @"Conference AV join failed: $conference_number";
+            logger.e(message);
+            throw new ToxError.GENERIC(message);
+          }
+          break;
+        default:
+          var err = ErrConferenceJoin.OK;
+          conference_number = handle.conference_join(friend_number, cookie, out err);
+          if (err != ErrConferenceJoin.OK) {
+            logger.e("Conference join failed: " + err.to_string());
+            throw new ToxError.GENERIC(err.to_string());
+          }
+          break;
+      }
+
+      conference_listener.on_conference_new(conference_number, "");
+    }
+
     public virtual void conference_delete(uint32 conference_number) throws ToxError {
       var e = ErrConferenceDelete.OK;
       handle.conference_delete(conference_number, out e);
diff --git a/src/ui/add_contact_widget.ui b/src/ui/add_contact_widget.ui
index 32961af..0f1af88 100644
--- a/src/ui/add_contact_widget.ui
+++ b/src/ui/add_contact_widget.ui
@@ -1,7 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="venom">
   <requires lib="gtk+" version="3.20"/>
+  <object class="GtkBox" id="placeholder">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="halign">center</property>
+    <property name="valign">center</property>
+    <property name="border_width">6</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkImage">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="icon_name">contact-new-symbolic</property>
+        <property name="icon_size">6</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">No new friend requests</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <style>
+      <class name="dim-label"/>
+    </style>
+  </object>
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes">Please let me add you to my contact list. 😁</property>
   </object>
@@ -32,14 +69,11 @@
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
-          <object class="GtkLabel">
+          <object class="GtkStackSwitcher">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Send a friend request</property>
-            <property name="xalign">0</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
+            <property name="halign">center</property>
+            <property name="stack">stack</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -48,183 +82,286 @@
           </packing>
         </child>
         <child>
-          <object class="GtkListBox">
-            <property name="width_request">450</property>
+          <object class="GtkStack" id="stack">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="selection_mode">none</property>
-            <property name="activate_on_single_click">False</property>
+            <property name="transition_type">crossfade</property>
             <child>
-              <object class="GtkListBoxRow">
+              <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_ID:</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
+                    <property name="label" translatable="yes">Send a friend request</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkListBox">
+                    <property name="width_request">450</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="selection_mode">none</property>
+                    <property name="activate_on_single_click">False</property>
                     <child>
-                      <object class="GtkEntry" id="contact_id">
+                      <object class="GtkListBoxRow">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip_text" translatable="yes">Enter a Tox ID or URI here</property>
-                        <property name="hexpand">True</property>
-                        <property name="activates_default">True</property>
-                        <property name="secondary_icon_name">edit-paste-symbolic</property>
-                        <property name="secondary_icon_tooltip_text" translatable="yes">paste from clipboard</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRevealer" id="contact_id_error_content">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkLabel" id="contact_id_error">
+                          <object class="GtkBox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label">Error id</property>
-                            <property name="xalign">0</property>
-                            <attributes>
-                              <attribute name="style" value="italic"/>
-                            </attributes>
+                            <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_ID:</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="contact_id">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">Enter a Tox ID or URI here</property>
+                                <property name="hexpand">True</property>
+                                <property name="activates_default">True</property>
+                                <property name="secondary_icon_name">edit-paste-symbolic</property>
+                                <property name="secondary_icon_tooltip_text" translatable="yes">paste from clipboard</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRevealer" id="contact_id_error_content">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" id="contact_id_error">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label">Error id</property>
+                                    <property name="xalign">0</property>
+                                    <attributes>
+                                      <attribute name="style" value="italic"/>
+                                    </attributes>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">&lt;small&gt;Enter your friends Tox ID&lt;/small&gt;</property>
+                                <property name="use_markup">True</property>
+                                <property name="xalign">0</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkListBoxRow">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;small&gt;Enter your friends Tox ID&lt;/small&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="xalign">0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Message:</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkScrolledWindow">
+                                <property name="height_request">100</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkViewport">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkTextView" id="contact_message">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="tooltip_text" translatable="yes">Send a custom message to be displayed to the friend you are adding</property>
+                                        <property name="border_width">6</property>
+                                        <property name="wrap_mode">word</property>
+                                        <property name="buffer">textbuffer1</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <style>
+                                  <class name="frame"/>
+                                </style>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">&lt;small&gt;Send your friend a short message&lt;/small&gt;</property>
+                                <property name="use_markup">True</property>
+                                <property name="wrap">True</property>
+                                <property name="xalign">0</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
                     </child>
+                    <style>
+                      <class name="frame"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="send">
+                    <property name="label" translatable="yes">Send</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <style>
+                      <class name="suggested-action"/>
+                    </style>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="name">page0</property>
+                <property name="title" translatable="yes">Add a friend</property>
+              </packing>
             </child>
             <child>
-              <object class="GtkListBoxRow">
+              <object class="GtkBox" id="friend_request_item">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Message:</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow">
-                        <property name="height_request">100</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkViewport">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkTextView" id="contact_message">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">Send a custom message to be displayed to the friend you are adding</property>
-                                <property name="border_width">6</property>
-                                <property name="wrap_mode">word</property>
-                                <property name="buffer">textbuffer1</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <style>
-                          <class name="frame"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;small&gt;Send your friend a short message&lt;/small&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="wrap">True</property>
-                        <property name="xalign">0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
+                    <property name="label" translatable="yes">Friend requests</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkListBox" id="friend_requests">
+                    <property name="width_request">450</property>
+                    <property name="height_request">350</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="selection_mode">none</property>
+                    <property name="activate_on_single_click">False</property>
+                    <style>
+                      <class name="frame"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="name">page1</property>
+                <property name="title" translatable="yes">Friend requests</property>
+                <property name="position">1</property>
+              </packing>
             </child>
-            <style>
-              <class name="frame"/>
-            </style>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -232,25 +369,9 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkButton" id="send">
-            <property name="label" translatable="yes">Send</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
       </object>
       <packing>
-        <property name="expand">True</property>
+        <property name="expand">False</property>
         <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
diff --git a/src/ui/conference_invite_entry.ui b/src/ui/conference_invite_entry.ui
new file mode 100644
index 0000000..0059d8d
--- /dev/null
+++ b/src/ui/conference_invite_entry.ui
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface domain="venom">
+  <requires lib="gtk+" version="3.20"/>
+  <template class="VenomConferenceInviteEntry" parent="GtkListBoxRow">
+    <property name="visible">True</property>
+    <property name="can_focus">True</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">6</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkImage" id="contact_image">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="pixel_size">24</property>
+            <property name="icon_name">friend-symbolic</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="valign">center</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Invite from:</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="contact_name">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label">contact_name</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">center</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkButton" id="accept">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Accept invite</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">object-select-symbolic</property>
+                      </object>
+                    </child>
+                    <style>
+                      <class name="suggested-action"/>
+                      <class name="image-button"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="reject">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Reject invite</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">user-trash-symbolic</property>
+                      </object>
+                    </child>
+                    <style>
+                      <class name="destructive-action"/>
+                      <class name="image-button"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/src/ui/contact_list_widget.ui b/src/ui/contact_list_widget.ui
index 8c8743f..ebba8fa 100644
--- a/src/ui/contact_list_widget.ui
+++ b/src/ui/contact_list_widget.ui
@@ -154,6 +154,56 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkRevealer" id="friend_request_revealer">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="transition_type">slide-up</property>
+            <child>
+              <object class="GtkButton" id="friend_request_button">
+                <property name="label">friend_request_button</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">win.add_contact</property>
+                <style>
+                  <class name="suggested-action"/>
+                </style>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkRevealer" id="conference_invite_revealer">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="transition_type">slide-up</property>
+            <child>
+              <object class="GtkButton" id="conference_invite_button">
+                <property name="label">conference_invite_button</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">win.groupchats</property>
+                <style>
+                  <class name="suggested-action"/>
+                </style>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
@@ -208,7 +258,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -219,7 +269,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">3</property>
           </packing>
         </child>
         <child>
@@ -243,7 +293,7 @@
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">4</property>
           </packing>
         </child>
         <child>
@@ -254,7 +304,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">3</property>
+            <property name="position">5</property>
           </packing>
         </child>
       </object>
diff --git a/src/ui/create_groupchat_widget.ui b/src/ui/create_groupchat_widget.ui
index a91eefb..d2621ff 100644
--- a/src/ui/create_groupchat_widget.ui
+++ b/src/ui/create_groupchat_widget.ui
@@ -29,14 +29,11 @@
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
-          <object class="GtkLabel">
+          <object class="GtkStackSwitcher">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Create a conference</property>
-            <property name="xalign">0</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
+            <property name="halign">center</property>
+            <property name="stack">stack</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -45,196 +42,299 @@
           </packing>
         </child>
         <child>
-          <object class="GtkListBox">
-            <property name="width_request">400</property>
+          <object class="GtkStack" id="stack">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="selection_mode">none</property>
-            <property name="activate_on_single_click">False</property>
+            <property name="transition_type">crossfade</property>
             <child>
-              <object class="GtkListBoxRow">
+              <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Title:</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
+                    <property name="label" translatable="yes">Create a conference</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkListBox">
+                    <property name="width_request">400</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="selection_mode">none</property>
+                    <property name="activate_on_single_click">False</property>
                     <child>
-                      <object class="GtkEntry" id="title">
+                      <object class="GtkListBoxRow">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="activates_default">True</property>
-                        <property name="text" translatable="yes">Conference</property>
-                        <property name="secondary_icon_tooltip_text" translatable="yes">paste from clipboard</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRevealer" id="title_error_content">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkLabel" id="title_error">
+                          <object class="GtkBox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label">title_error</property>
-                            <property name="xalign">0</property>
-                            <attributes>
-                              <attribute name="style" value="italic"/>
-                            </attributes>
+                            <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Title:</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="title">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hexpand">True</property>
+                                <property name="activates_default">True</property>
+                                <property name="text" translatable="yes">Conference</property>
+                                <property name="secondary_icon_tooltip_text" translatable="yes">paste from clipboard</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRevealer" id="title_error_content">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" id="title_error">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label">title_error</property>
+                                    <property name="xalign">0</property>
+                                    <attributes>
+                                      <attribute name="style" value="italic"/>
+                                    </attributes>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">&lt;small&gt;Name the conference (optional)&lt;/small&gt;</property>
+                                <property name="use_markup">True</property>
+                                <property name="xalign">0</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkListBoxRow">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;small&gt;Name the conference (optional)&lt;/small&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="xalign">0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
+                        <property name="can_focus">True</property>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">T_ype:</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="homogeneous">True</property>
+                                <child>
+                                  <object class="GtkRadioButton" id="type_text">
+                                    <property name="label" translatable="yes">Text</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="type_av">
+                                    <property name="label" translatable="yes">Speech</property>
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">False</property>
+                                    <property name="group">type_text</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <style>
+                                  <class name="linked"/>
+                                </style>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">&lt;small&gt;Select a conference type&lt;/small&gt;</property>
+                                <property name="use_markup">True</property>
+                                <property name="xalign">0</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
                     </child>
+                    <style>
+                      <class name="frame"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="create">
+                    <property name="label" translatable="yes">Create</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <style>
+                      <class name="suggested-action"/>
+                    </style>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="name">page0</property>
+                <property name="title" translatable="yes">New conference</property>
+              </packing>
             </child>
             <child>
-              <object class="GtkListBoxRow">
+              <object class="GtkBox" id="conference_invite_item">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">T_ype:</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="homogeneous">True</property>
-                        <child>
-                          <object class="GtkRadioButton" id="type_text">
-                            <property name="label" translatable="yes">Text</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">False</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="type_av">
-                            <property name="label" translatable="yes">Speech</property>
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">False</property>
-                            <property name="group">type_text</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="linked"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;small&gt;Select a conference type&lt;/small&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="xalign">0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
+                    <property name="label" translatable="yes">Conference invites</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkListBox" id="conference_invites">
+                    <property name="width_request">450</property>
+                    <property name="height_request">350</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="selection_mode">none</property>
+                    <property name="activate_on_single_click">False</property>
+                    <style>
+                      <class name="frame"/>
+                    </style>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="name">page1</property>
+                <property name="title" translatable="yes">Conference invites</property>
+                <property name="position">1</property>
+              </packing>
             </child>
-            <style>
-              <class name="frame"/>
-            </style>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -242,22 +342,6 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkButton" id="create">
-            <property name="label" translatable="yes">Create</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
       </object>
       <packing>
         <property name="expand">True</property>
@@ -278,4 +362,41 @@
       </packing>
     </child>
   </template>
+  <object class="GtkBox" id="placeholder">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="halign">center</property>
+    <property name="valign">center</property>
+    <property name="border_width">6</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkImage">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="icon_name">conference-symbolic</property>
+        <property name="icon_size">6</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">No new conference invites</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <style>
+      <class name="dim-label"/>
+    </style>
+  </object>
 </interface>
diff --git a/src/ui/friend_request_widget.ui b/src/ui/friend_request_widget.ui
index ba2a2ea..8cd09ae 100644
--- a/src/ui/friend_request_widget.ui
+++ b/src/ui/friend_request_widget.ui
@@ -1,77 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="venom">
   <requires lib="gtk+" version="3.20"/>
-  <template class="VenomFriendRequestWidget" parent="GtkBox">
+  <template class="VenomFriendRequestWidget" parent="GtkListBoxRow">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="spacing">12</property>
-    <child>
-      <object class="GtkImage">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">end</property>
-        <property name="valign">start</property>
-        <property name="icon_name">contact-new-symbolic</property>
-        <property name="icon_size">6</property>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
+    <property name="can_focus">True</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
+        <property name="border_width">6</property>
+        <property name="spacing">12</property>
         <child>
-          <object class="GtkBox">
+          <object class="GtkImage">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Friend request</property>
-                <property name="xalign">0</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="reject">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Reject request</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="icon_name">user-trash-symbolic</property>
-                  </object>
-                </child>
-                <style>
-                  <class name="destructive-action"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
+            <property name="halign">end</property>
+            <property name="valign">start</property>
+            <property name="pixel_size">44</property>
+            <property name="icon_name">friend-symbolic</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -80,184 +27,180 @@
           </packing>
         </child>
         <child>
-          <object class="GtkListBox">
-            <property name="width_request">450</property>
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="selection_mode">none</property>
-            <property name="activate_on_single_click">False</property>
+            <property name="spacing">6</property>
             <child>
-              <object class="GtkListBoxRow">
+              <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">_Public key:</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="contact_id">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label">contact_id</property>
+                    <property name="selectable">True</property>
+                    <property name="xalign">0</property>
+                    <style>
+                      <class name="monospace"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">_Message:</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkBox">
+                    <property name="height_request">100</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
                     <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkLabel" id="contact_message">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_ID:</property>
-                        <property name="use_underline">True</property>
+                        <property name="margin_left">6</property>
+                        <property name="margin_right">6</property>
+                        <property name="margin_top">6</property>
+                        <property name="margin_bottom">6</property>
+                        <property name="label">contact_message</property>
+                        <property name="wrap">True</property>
+                        <property name="wrap_mode">word-char</property>
                         <property name="xalign">0</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
+                        <property name="yalign">0</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
+                        <property name="expand">True</property>
                         <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkLabel" id="contact_id">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label">contact_id</property>
-                        <property name="selectable">True</property>
-                        <property name="xalign">0</property>
-                        <style>
-                          <class name="monospace"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <style>
+                      <class name="frame"/>
+                      <class name="content"/>
+                    </style>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child>
-              <object class="GtkListBoxRow">
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkButton" id="reject">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Reject request</property>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkImage">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Message:</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
+                        <property name="icon_name">user-trash-symbolic</property>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
+                    <style>
+                      <class name="destructive-action"/>
+                      <class name="image-button"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="accept">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Accept request</property>
                     <child>
-                      <object class="GtkBox">
-                        <property name="height_request">100</property>
+                      <object class="GtkImage">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="GtkLabel" id="contact_message">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_left">6</property>
-                            <property name="margin_right">6</property>
-                            <property name="margin_top">6</property>
-                            <property name="margin_bottom">6</property>
-                            <property name="label">contact_message</property>
-                            <property name="wrap">True</property>
-                            <property name="wrap_mode">word-char</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <style>
-                          <class name="frame"/>
-                          <class name="view"/>
-                        </style>
+                        <property name="icon_name">object-select-symbolic</property>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
+                    <style>
+                      <class name="suggested-action"/>
+                      <class name="image-button"/>
+                    </style>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
-            <style>
-              <class name="frame"/>
-            </style>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkButton" id="accept">
-            <property name="label" translatable="yes">Accept</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Accept request</property>
-            <style>
-              <class name="suggested-action"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
     </child>
   </template>
 </interface>
diff --git a/src/ui/venom.gresource.xml b/src/ui/venom.gresource.xml
index 523073c..2b979f0 100644
--- a/src/ui/venom.gresource.xml
+++ b/src/ui/venom.gresource.xml
@@ -5,6 +5,7 @@
     <file compressed="true" preprocess="xml-stripblanks">app_menu.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">application_window.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">conference_info_widget.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">conference_invite_entry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">conference_window.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">contact_list_entry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">contact_list_request_entry.ui</file>
diff --git a/src/view/AddContactWidget.vala b/src/view/AddContactWidget.vala
index 4ca7885..f5360ea 100644
--- a/src/view/AddContactWidget.vala
+++ b/src/view/AddContactWidget.vala
@@ -27,20 +27,32 @@ namespace Venom {
     [GtkChild] private Gtk.Button send;
     [GtkChild] private Gtk.Label contact_id_error;
     [GtkChild] private Gtk.Revealer contact_id_error_content;
+    [GtkChild] private Gtk.Box placeholder;
+    [GtkChild] private Gtk.ListBox friend_requests;
+
+    [GtkChild] private Gtk.Stack stack;
+    [GtkChild] private Gtk.Box friend_request_item;
 
     private ILogger logger;
     private AddContactWidgetListener listener;
     private AddContactViewModel view_model;
+    private ContainerChildBooleanBinding stack_binding;
 
-    public AddContactWidget(ILogger logger, AddContactWidgetListener listener) {
+    public AddContactWidget(ILogger logger, ObservableList friend_requests_model, AddContactWidgetListener listener, FriendRequestWidgetListener friend_request_listener) {
       logger.d("AddContactWidget created.");
       this.logger = logger;
-      view_model = new AddContactViewModel(logger, listener);
+      view_model = new AddContactViewModel(logger, friend_requests_model, listener);
+      stack_binding = new ContainerChildBooleanBinding(stack, friend_request_item, "needs-attention");
 
       contact_id.bind_property("text", view_model, "contact-id", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
       contact_message.buffer.bind_property("text", view_model, "contact-message", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
-      view_model.bind_property("contact-id-error-message", contact_id_error, "label" , BindingFlags.SYNC_CREATE);
+      view_model.bind_property("contact-id-error-message", contact_id_error, "label", BindingFlags.SYNC_CREATE);
       view_model.bind_property("contact-id-error-visible", contact_id_error_content, "reveal-child", BindingFlags.SYNC_CREATE);
+      view_model.bind_property("new-friend-request", stack_binding, "active", BindingFlags.SYNC_CREATE);
+
+      friend_requests.set_placeholder(placeholder);
+      var creator = new FriendRequestWidgetCreator(logger, friend_request_listener);
+      friend_requests.bind_model(view_model.get_list_model(), creator.create);
 
       contact_id.icon_release.connect(view_model.on_paste_clipboard);
       send.clicked.connect(view_model.on_send);
@@ -49,5 +61,18 @@ namespace Venom {
     ~AddContactWidget() {
       logger.d("AddContactWidget destroyed.");
     }
+
+    public class FriendRequestWidgetCreator {
+      private unowned ILogger logger;
+      private FriendRequestWidgetListener listener;
+      public FriendRequestWidgetCreator(ILogger logger, FriendRequestWidgetListener listener) {
+        this.logger = logger;
+        this.listener = listener;
+      }
+
+      public Gtk.Widget create(GLib.Object o) {
+        return new FriendRequestWidget(logger, o as FriendRequest, listener);
+      }
+    }
   }
 }
diff --git a/src/view/ApplicationWindow.vala b/src/view/ApplicationWindow.vala
index 148241c..d5345a6 100644
--- a/src/view/ApplicationWindow.vala
+++ b/src/view/ApplicationWindow.vala
@@ -35,14 +35,9 @@ namespace Venom {
       { "invite-to-conference", on_invite_to_conference, "s", null, null }
     };
 
-    [GtkChild]
-    private Gtk.Box contact_list_box;
-
-    [GtkChild]
-    private Gtk.Revealer content_revealer;
-
-    [GtkChild]
-    private Gtk.StatusIcon status_icon;
+    [GtkChild] private Gtk.Box contact_list_box;
+    [GtkChild] private Gtk.Revealer content_revealer;
+    [GtkChild] private Gtk.StatusIcon status_icon;
 
     private Gtk.Widget current_content_widget;
     private WidgetProvider next_content_widget;
@@ -57,12 +52,15 @@ namespace Venom {
     private ToxAdapterConferenceListenerImpl conference_listener;
     private ToxAdapterFiletransferListenerImpl filetransfer_listener;
     private ToxAdapterSelfListenerImpl session_listener;
-    private ObservableList contacts;
-    private ObservableList transfers;
     private NotificationListener notification_listener;
     private WindowState window_state;
     private unowned ContactListViewModel contact_list_view_model;
 
+    private ObservableList contacts;
+    private ObservableList transfers;
+    private ObservableList friend_requests;
+    private ObservableList conference_invites;
+
     private GLib.HashTable<IContact, ObservableList> conversations;
     private UserInfo user_info;
 
@@ -85,13 +83,17 @@ namespace Venom {
       contacts.set_list(new GLib.List<IContact>());
       transfers = new ObservableList();
       transfers.set_list(new GLib.List<FileTransfer>());
+      friend_requests = new ObservableList();
+      friend_requests.set_list(new GLib.List<FriendRequest>());
+      conference_invites = new ObservableList();
+      conference_invites.set_list(new GLib.List<ConferenceInvite>());
 
       notification_listener = new NotificationListenerImpl(logger);
       notification_listener.clear_notifications();
 
       session_listener = new ToxAdapterSelfListenerImpl(logger, user_info);
-      friend_listener = new ToxAdapterFriendListenerImpl(logger, contacts, conversations, notification_listener);
-      conference_listener = new ToxAdapterConferenceListenerImpl(logger, contacts, conversations, notification_listener);
+      friend_listener = new ToxAdapterFriendListenerImpl(logger, contacts, friend_requests, conversations, notification_listener);
+      conference_listener = new ToxAdapterConferenceListenerImpl(logger, contacts, conference_invites, conversations, notification_listener);
       filetransfer_listener = new ToxAdapterFiletransferListenerImpl(logger, transfers, notification_listener);
 
       settings_database.bind_property("enable-send-typing", friend_listener, "show-typing", BindingFlags.SYNC_CREATE);
@@ -205,7 +207,7 @@ namespace Venom {
         logger.f("Could not set icon from theme: " + e.message);
       }
 
-      var contact_list = new ContactListWidget(logger, contacts, this, user_info);
+      var contact_list = new ContactListWidget(logger, contacts, friend_requests, conference_invites, this, user_info);
       contact_list_box.pack_start(contact_list, true, true);
       contact_list_view_model = contact_list.get_model();
     }
@@ -218,8 +220,6 @@ namespace Venom {
       } else if (contact is Conference) {
         var conv = conversations.@get(contact);
         switch_content_with(() => { return new ConferenceWindow(this, logger, conv, contact, conference_listener); });
-      } else if (contact is FriendRequest) {
-        on_show_friend_request(contact);
       }
     }
 
@@ -260,7 +260,7 @@ namespace Venom {
     }
 
     private void on_create_groupchat() {
-      switch_content_with(() => { return new CreateGroupchatWidget(logger, conference_listener); });
+      switch_content_with(() => { return new CreateGroupchatWidget(logger, conference_invites, conference_listener, conference_listener); });
     }
 
     public void on_filetransfer() {
@@ -275,10 +275,6 @@ namespace Venom {
       switch_content_with(() => { return new ConferenceInfoWidget(logger, this, conference_listener, contact, settings_database); });
     }
 
-    public void on_show_friend_request(IContact contact) {
-      switch_content_with(() => { return new FriendRequestWidget(this, logger, contact, friend_listener); });
-    }
-
     private IContact ? find_contact(string contact_id) {
       for (var i = 0; i < contacts.length(); i++) {
         var c = contacts.nth_data(i) as IContact;
@@ -315,8 +311,6 @@ namespace Venom {
         on_show_friend(c);
       } else if (c is Conference) {
         on_show_conference(c);
-      } else if (c is FriendRequest) {
-        on_show_friend_request(c);
       }
     }
 
@@ -332,7 +326,7 @@ namespace Venom {
 
     public void on_invite_id_to_conference(IContact contact, string id) {
       try {
-        conference_listener.on_conference_invite(contact, id);
+        conference_listener.on_send_conference_invite(contact, id);
       } catch (Error e) {
         logger.e("Could not send conference invite: " + e.message);
       }
@@ -358,7 +352,7 @@ namespace Venom {
     private void on_add_contact() {
       logger.d("on_add_contact()");
       switch_content_with(() => {
-        var widget = new AddContactWidget(logger, friend_listener);
+        var widget = new AddContactWidget(logger, friend_requests, friend_listener, friend_listener);
         return widget;
       });
     }
diff --git a/src/view/ConferenceInviteEntry.vala b/src/view/ConferenceInviteEntry.vala
new file mode 100644
index 0000000..0ff0d73
--- /dev/null
+++ b/src/view/ConferenceInviteEntry.vala
@@ -0,0 +1,78 @@
+/*
+ *    ConferenceInviteEntry.vala
+ *
+ *    Copyright (C) 2018 Venom authors and contributors
+ *
+ *    This file is part of Venom.
+ *
+ *    Venom is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    Venom is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Venom.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Venom {
+  [GtkTemplate(ui = "/im/tox/venom/ui/conference_invite_entry.ui")]
+  public class ConferenceInviteEntry : Gtk.ListBoxRow {
+    private ILogger logger;
+    private ConferenceInvite invite;
+    private ConferenceInviteEntryListener listener;
+
+    [GtkChild] private Gtk.Image contact_image;
+    [GtkChild] private Gtk.Label contact_name;
+
+    [GtkChild] private Gtk.Button accept;
+    [GtkChild] private Gtk.Button reject;
+
+    public ConferenceInviteEntry(ILogger logger, ConferenceInvite invite, ConferenceInviteEntryListener listener) {
+      logger.d("ConferenceInviteEntry created.");
+      this.logger = logger;
+      this.invite = invite;
+      this.listener = listener;
+
+      var sender = invite.sender;
+
+      var pixbuf = sender.get_image();
+      if (pixbuf != null) {
+        contact_image.pixbuf = pixbuf.scale_simple(24, 24, Gdk.InterpType.BILINEAR);
+      }
+      contact_name.label = sender.get_name_string();
+
+      accept.clicked.connect(on_accept_clicked);
+      reject.clicked.connect(on_reject_clicked);
+    }
+
+    private void on_accept_clicked() {
+      try {
+        listener.on_accept_conference_invite(invite);
+      } catch (Error e) {
+        logger.i("Could not accept conference invite: " + e.message);
+      }
+    }
+
+    private void on_reject_clicked() {
+      try {
+        listener.on_reject_conference_invite(invite);
+      } catch (Error e) {
+        logger.i("Could not reject conference invite: " + e.message);
+      }
+    }
+
+    ~ConferenceInviteEntry() {
+      logger.d("ConferenceInviteEntry destroyed.");
+    }
+  }
+
+  public interface ConferenceInviteEntryListener : GLib.Object {
+    public abstract void on_accept_conference_invite(ConferenceInvite invite) throws Error;
+    public abstract void on_reject_conference_invite(ConferenceInvite invite) throws Error;
+  }
+}
diff --git a/src/view/ContactListWidget.vala b/src/view/ContactListWidget.vala
index 1b450d9..4e39924 100644
--- a/src/view/ContactListWidget.vala
+++ b/src/view/ContactListWidget.vala
@@ -31,13 +31,17 @@ namespace Venom {
     [GtkChild] private Gtk.ListBox contact_list;
     [GtkChild] private Gtk.Image image_status;
     [GtkChild] private Gtk.MenuButton user_status_menu;
+    [GtkChild] private Gtk.Revealer friend_request_revealer;
+    [GtkChild] private Gtk.Button friend_request_button;
+    [GtkChild] private Gtk.Revealer conference_invite_revealer;
+    [GtkChild] private Gtk.Button conference_invite_button;
 
     private unowned Gtk.ListBoxRow? selected_row;
 
-    public ContactListWidget(ILogger logger, ObservableList contacts, ContactListWidgetCallback callback, UserInfo user_info) {
+    public ContactListWidget(ILogger logger, ObservableList contacts, ObservableList friend_requests, ObservableList conference_invites, ContactListWidgetCallback callback, UserInfo user_info) {
       logger.d("ContactListWidget created.");
       this.logger = logger;
-      this.view_model = new ContactListViewModel(logger, contacts, callback, user_info);
+      this.view_model = new ContactListViewModel(logger, contacts, friend_requests, conference_invites, callback, user_info);
 
       try {
         var builder = new Gtk.Builder.from_resource("/im/tox/venom/ui/user_status_menu.ui");
@@ -55,6 +59,10 @@ namespace Venom {
       view_model.bind_property("statusmessage", statusmessage, "label", GLib.BindingFlags.SYNC_CREATE);
       view_model.bind_property("userimage", userimage, "pixbuf", GLib.BindingFlags.SYNC_CREATE);
       view_model.bind_property("image-status", image_status, "icon-name", GLib.BindingFlags.SYNC_CREATE);
+      view_model.bind_property("friend-request-visible", friend_request_revealer, "reveal-child", GLib.BindingFlags.SYNC_CREATE);
+      view_model.bind_property("friend-request-label", friend_request_button, "label", GLib.BindingFlags.SYNC_CREATE);
+      view_model.bind_property("conference-invite-visible", conference_invite_revealer, "reveal-child", GLib.BindingFlags.SYNC_CREATE);
+      view_model.bind_property("conference-invite-label", conference_invite_button, "label", GLib.BindingFlags.SYNC_CREATE);
 
       contact_list.button_press_event.connect(on_button_pressed);
       contact_list.popup_menu.connect(on_popup_menu);
diff --git a/src/view/CreateGroupchatWidget.vala b/src/view/CreateGroupchatWidget.vala
index 18a006d..c142991 100644
--- a/src/view/CreateGroupchatWidget.vala
+++ b/src/view/CreateGroupchatWidget.vala
@@ -28,23 +28,48 @@ namespace Venom {
     [GtkChild] private Gtk.Revealer title_error_content;
     [GtkChild] private Gtk.Label title_error;
 
+    [GtkChild] private Gtk.ListBox conference_invites;
+    [GtkChild] private Gtk.Box conference_invite_item;
+    [GtkChild] private Gtk.Box placeholder;
+    [GtkChild] private Gtk.Stack stack;
+
     private ILogger logger;
     private CreateGroupchatViewModel view_model;
+    private ContainerChildBooleanBinding stack_binding;
 
-    public CreateGroupchatWidget(ILogger logger, CreateGroupchatWidgetListener listener) {
+    public CreateGroupchatWidget(ILogger logger, ObservableList conference_invites_model, CreateGroupchatWidgetListener listener, ConferenceInviteEntryListener entry_listener) {
       logger.d("CreateGroupChatWidget created.");
       this.logger = logger;
-      this.view_model = new CreateGroupchatViewModel(logger, listener);
+      this.view_model = new CreateGroupchatViewModel(logger, conference_invites_model, listener);
+      stack_binding = new ContainerChildBooleanBinding(stack, conference_invite_item, "needs-attention");
 
       title.bind_property("text", view_model, "title", GLib.BindingFlags.SYNC_CREATE | GLib.BindingFlags.BIDIRECTIONAL);
       view_model.bind_property("title-error", title_error, "label", GLib.BindingFlags.SYNC_CREATE);
       view_model.bind_property("title-error-visible", title_error_content, "reveal-child", GLib.BindingFlags.SYNC_CREATE);
-      //FIXME type binding
+      view_model.bind_property("new-conference-invite", stack_binding, "active", BindingFlags.SYNC_CREATE);
+
       create.clicked.connect(view_model.on_create);
+
+      var creator = new ConferenceInviteEntryCreator(logger, entry_listener);
+      conference_invites.bind_model(view_model.get_list_model(), creator.create);
+      conference_invites.set_placeholder(placeholder);
     }
 
     ~CreateGroupchatWidget() {
       logger.d("CreateGroupChatWidget destroyed.");
     }
+
+    private class ConferenceInviteEntryCreator {
+      private ILogger logger;
+      private ConferenceInviteEntryListener listener;
+      public ConferenceInviteEntryCreator(ILogger logger, ConferenceInviteEntryListener listener) {
+        this.logger = logger;
+        this.listener = listener;
+      }
+
+      public Gtk.Widget create(GLib.Object o) {
+        return new ConferenceInviteEntry(logger, o as ConferenceInvite, listener);
+      }
+    }
   }
 }
diff --git a/src/view/FriendRequestWidget.vala b/src/view/FriendRequestWidget.vala
index 4cd8124..ad58364 100644
--- a/src/view/FriendRequestWidget.vala
+++ b/src/view/FriendRequestWidget.vala
@@ -21,39 +21,32 @@
 
 namespace Venom {
   [GtkTemplate(ui = "/im/tox/venom/ui/friend_request_widget.ui")]
-  public class FriendRequestWidget : Gtk.Box {
+  public class FriendRequestWidget : Gtk.ListBoxRow {
     private ILogger logger;
-    private IContact contact;
+    private FriendRequest friend_request;
     private FriendRequestWidgetListener listener;
-    private unowned ApplicationWindow app;
 
-    [GtkChild]
-    private Gtk.Label contact_id;
-    [GtkChild]
-    private Gtk.Label contact_message;
+    [GtkChild] private Gtk.Label contact_id;
+    [GtkChild] private Gtk.Label contact_message;
 
-    [GtkChild]
-    private Gtk.Button accept;
-    [GtkChild]
-    private Gtk.Button reject;
+    [GtkChild] private Gtk.Button accept;
+    [GtkChild] private Gtk.Button reject;
 
-    public FriendRequestWidget(ApplicationWindow app, ILogger logger, IContact contact, FriendRequestWidgetListener listener) {
+    public FriendRequestWidget(ILogger logger, FriendRequest friend_request, FriendRequestWidgetListener listener) {
       logger.d("FriendRequestWidget created.");
       this.logger = logger;
-      this.contact = contact;
-      this.app = app;
+      this.friend_request = friend_request;
       this.listener = listener;
 
-      contact_id.label = contact.get_id();
-      contact_message.label = contact.get_status_string();
+      contact_id.label = friend_request.id;
+      contact_message.label = friend_request.message;
       accept.clicked.connect(on_accept_clicked);
       reject.clicked.connect(on_reject_clicked);
     }
 
     private void on_accept_clicked() {
       try {
-        listener.on_accept_friend_request(contact.get_id());
-        app.show_welcome();
+        listener.on_accept_friend_request(friend_request.id);
       } catch (Error e) {
         logger.i("Could not accept friend request: " + e.message);
       }
@@ -61,8 +54,7 @@ namespace Venom {
 
     private void on_reject_clicked() {
       try {
-        listener.on_reject_friend_request(contact.get_id());
-        app.show_welcome();
+        listener.on_reject_friend_request(friend_request.id);
       } catch (Error e) {
         logger.i("Could not reject friend request: " + e.message);
       }
diff --git a/src/viewmodel/AddContactViewModel.vala b/src/viewmodel/AddContactViewModel.vala
index 04aa5bb..801ff11 100644
--- a/src/viewmodel/AddContactViewModel.vala
+++ b/src/viewmodel/AddContactViewModel.vala
@@ -25,16 +25,30 @@ namespace Venom {
     public string contact_message { get; set; }
     public bool contact_id_error_visible { get; set; }
     public string contact_id_error_message { get; set; }
+    public bool new_friend_request { get; set; }
 
     private ILogger logger;
     private AddContactWidgetListener listener;
+    private ObservableList friend_requests;
 
-    public AddContactViewModel(ILogger logger, AddContactWidgetListener listener) {
+    public AddContactViewModel(ILogger logger, ObservableList friend_requests, AddContactWidgetListener listener) {
       logger.d("AddContactViewModel created.");
       this.logger = logger;
+      this.friend_requests = friend_requests;
       this.listener = listener;
 
       this.notify["contact-id"].connect(() => { contact_id_error_visible = false; });
+
+      friend_requests.changed.connect(update_content);
+      update_content();
+    }
+
+    private void update_content() {
+      new_friend_request = friend_requests.length() > 0;
+    }
+
+    public ListModel get_list_model() {
+      return new ObservableListModel(friend_requests);
     }
 
     public void on_send() {
@@ -61,4 +75,20 @@ namespace Venom {
   public interface AddContactWidgetListener : GLib.Object {
     public abstract void on_send_friend_request(string id, string message) throws Error;
   }
+
+  public class ContainerChildBooleanBinding : GLib.Object {
+    private Gtk.Container container;
+    private Gtk.Widget child;
+    private string property_name;
+    public bool active {
+      set {
+        container.child_set(child, property_name, value);
+      }
+    }
+    public ContainerChildBooleanBinding(Gtk.Container container, Gtk.Widget child, string property_name) {
+      this.container = container;
+      this.child = child;
+      this.property_name = property_name;
+    }
+  }
 }
diff --git a/src/viewmodel/ContactListViewModel.vala b/src/viewmodel/ContactListViewModel.vala
index ec55c77..8567305 100644
--- a/src/viewmodel/ContactListViewModel.vala
+++ b/src/viewmodel/ContactListViewModel.vala
@@ -25,6 +25,8 @@ namespace Venom {
     private ContactListWidgetCallback callback;
     private UserInfo user_info;
     private ObservableList contacts;
+    private ObservableList friend_requests;
+    private ObservableList conference_invites;
 
     private WeakRef right_clicked_contact;
     private WeakRef selected_contact;
@@ -33,19 +35,31 @@ namespace Venom {
     public string statusmessage { get; set; }
     public Gdk.Pixbuf userimage { get; set; }
     public string image_status { get; set; }
+    public bool friend_request_visible { get; set; }
+    public string friend_request_label { get; set; }
+    public bool conference_invite_visible { get; set; }
+    public string conference_invite_label { get; set; }
 
-    public ContactListViewModel(ILogger logger, ObservableList contacts, ContactListWidgetCallback callback, UserInfo user_info) {
+    public ContactListViewModel(ILogger logger, ObservableList contacts, ObservableList friend_requests, ObservableList conference_invites, ContactListWidgetCallback callback, UserInfo user_info) {
       logger.d("ContactListViewModel created.");
       this.logger = logger;
+      this.contacts = contacts;
+      this.friend_requests = friend_requests;
+      this.conference_invites = conference_invites;
       this.callback = callback;
       this.user_info = user_info;
-      this.contacts = contacts;
 
       right_clicked_contact = new WeakRef(null);
       selected_contact = new WeakRef(null);
 
       refresh_user_info(this);
       user_info.info_changed.connect(refresh_user_info);
+
+      refresh_friend_requests();
+      friend_requests.changed.connect(refresh_friend_requests);
+
+      refresh_conference_invites();
+      conference_invites.changed.connect(refresh_conference_invites);
     }
 
     public ListModel get_list_model() {
@@ -60,7 +74,7 @@ namespace Venom {
     }
 
     private bool peers_contain(Gee.Collection<ConferencePeer> peers, string id) {
-      foreach(var peer in peers) {
+      foreach (var peer in peers) {
         if (peer.peer_key == id) {
           return true;
         }
@@ -87,7 +101,7 @@ namespace Venom {
         var conference_menu = new GLib.Menu();
         conference_menu.append(_("New conference…"), @"win.invite-to-conference('')");
 
-        for(var i = 0; i < contacts.length(); i++) {
+        for (var i = 0; i < contacts.length(); i++) {
           if (contacts.nth_data(i) is Conference) {
             var conference = contacts.nth_data(i) as Conference;
             var peers = conference.get_peers().values;
@@ -119,6 +133,22 @@ namespace Venom {
       }
     }
 
+    private void refresh_friend_requests() {
+      var count = friend_requests.length();
+      friend_request_visible = count > 0;
+      if (count > 0) {
+        friend_request_label = ngettext("%u new friend request", "%u new friend requests", count).printf(count);
+      }
+    }
+
+    private void refresh_conference_invites() {
+      var count = conference_invites.length();
+      conference_invite_visible = count > 0;
+      if (count > 0) {
+        conference_invite_label = ngettext("%u new conference invite", "%u new conference invites", count).printf(count);
+      }
+    }
+
     private string get_resource_from_status(UserStatus status) {
       switch (status) {
         case UserStatus.AWAY:
diff --git a/src/viewmodel/CreateGroupchatViewModel.vala b/src/viewmodel/CreateGroupchatViewModel.vala
index dbb1537..376ad6b 100644
--- a/src/viewmodel/CreateGroupchatViewModel.vala
+++ b/src/viewmodel/CreateGroupchatViewModel.vala
@@ -22,21 +22,36 @@
 namespace Venom {
   public class CreateGroupchatViewModel : GLib.Object {
     public string title { get; set; }
-    public GroupchatType group_chat_type { get; set; }
+    public ConferenceType conference_type { get; set; }
     public bool title_error_visible { get; set; }
     public string title_error { get; set; }
+    public bool new_conference_invite { get; set; }
+
     public signal void leave_view();
 
     private ILogger logger;
+    private ObservableList conference_invites;
     private CreateGroupchatWidgetListener listener;
 
-    public CreateGroupchatViewModel(ILogger logger, CreateGroupchatWidgetListener listener) {
+    public CreateGroupchatViewModel(ILogger logger, ObservableList conference_invites, CreateGroupchatWidgetListener listener) {
       logger.d("CreateGroupchatViewModel created.");
       this.logger = logger;
       this.listener = listener;
+      this.conference_invites = conference_invites;
 
-      group_chat_type = GroupchatType.TEXT;
+      conference_type = ConferenceType.TEXT;
       notify["title"].connect(() => { title_error_visible = false; });
+
+      conference_invites.changed.connect(update_content);
+      update_content();
+    }
+
+    public GLib.ListModel get_list_model() {
+      return new ObservableListModel(conference_invites);
+    }
+
+    private void update_content() {
+      new_conference_invite = conference_invites.length() > 0;
     }
 
     private void show_error(string message) {
@@ -50,7 +65,7 @@ namespace Venom {
         return;
       }
       try {
-        listener.on_create_groupchat(title, group_chat_type);
+        listener.on_create_groupchat(title, conference_type);
       } catch (Error e) {
         show_error("Could not create conference: " + e.message);
         return;
@@ -64,12 +79,7 @@ namespace Venom {
     }
   }
 
-  public enum GroupchatType {
-    TEXT,
-    AV
-  }
-
   public interface CreateGroupchatWidgetListener : GLib.Object {
-    public abstract void on_create_groupchat(string title, GroupchatType type) throws Error;
+    public abstract void on_create_groupchat(string title, ConferenceType type) throws Error;
   }
 }