diff --git a/.gitignore b/.gitignore
index 694ce720..a7659743 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,4 @@ build/
 /geary-console
 *.xz
 *.swp
-
+vapi/gmime-2.6/gmime-2.6.gi
diff --git a/src/client/ui/message-list-store.vala b/src/client/ui/message-list-store.vala
index ab9b5fb7..d87ade5e 100644
--- a/src/client/ui/message-list-store.vala
+++ b/src/client/ui/message-list-store.vala
@@ -119,7 +119,7 @@ public class MessageListStore : Gtk.TreeStore {
             return;
         }
         
-        remove(iter);
+        remove(ref iter);
     }
     
     public bool has_conversation(Geary.Conversation conversation) {
diff --git a/src/client/ui/sidebar/sidebar-tree.vala b/src/client/ui/sidebar/sidebar-tree.vala
index 69605891..328a8b42 100644
--- a/src/client/ui/sidebar/sidebar-tree.vala
+++ b/src/client/ui/sidebar/sidebar-tree.vala
@@ -533,7 +533,8 @@ public class Sidebar.Tree : Gtk.TreeView {
         if (only_children)
             return;
         
-        store.remove(wrapper.get_iter());
+        Gtk.TreeIter iter = wrapper.get_iter();
+        store.remove(ref iter);
         
         if (selected_wrapper == wrapper)
             selected_wrapper = null;
@@ -619,7 +620,8 @@ public class Sidebar.Tree : Gtk.TreeView {
         bool selected = (get_current_path().compare(wrapper.get_path()) == 0);
         
         // remove from current position in tree
-        store.remove(wrapper.get_iter());
+        Gtk.TreeIter iter = wrapper.get_iter();
+        store.remove(ref iter);
         
         Sidebar.Entry? parent = branch.get_parent(entry);
         assert(parent != null);
diff --git a/vapi/gmime-2.6.vapi b/vapi/gmime-2.6.vapi
index 391ce827..4d4c200b 100644
--- a/vapi/gmime-2.6.vapi
+++ b/vapi/gmime-2.6.vapi
@@ -1382,7 +1382,7 @@ namespace GMime {
 	[CCode (cheader_filename = "gmime/gmime.h", cname = "g_mime_yencode_step")]
 	public static size_t yencode_step (uint inbuf, size_t inlen, uint outbuf, int state, uint32 pcrc, uint32 crc);
 }
-[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddress", type_check_function = "IS_INTERNET_ADDRESS", type_id = "INTERNET_ADDRESS")]
+[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddress", type_check_function = "IS_INTERNET_ADDRESS", type_id = "INTERNET_ADDRESS_TYPE")]
 public class InternetAddress : GLib.Object {
 	[CCode (cname = "internet_address_get_name")]
 	public unowned string? get_name ();
@@ -1391,7 +1391,7 @@ public class InternetAddress : GLib.Object {
 	[CCode (cname = "internet_address_to_string")]
 	public virtual string to_string (bool encoded);
 }
-[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddressGroup", type_check_function = "INTERNET_ADDRESS_IS_GROUP", type_id = "INTERNET_ADDRESS_GROUP")]
+[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddressGroup", type_check_function = "INTERNET_ADDRESS_IS_GROUP", type_id = "INTERNET_ADDRESS_TYPE_GROUP")]
 public class InternetAddressGroup : InternetAddress {
 	[CCode (cname = "internet_address_group_new")]
 	public InternetAddressGroup (string name);
@@ -1402,7 +1402,7 @@ public class InternetAddressGroup : InternetAddress {
 	[CCode (cname = "internet_address_group_set_members")]
 	public void set_members (InternetAddressList members);
 }
-[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddressMailbox", type_check_function = "INTERNET_ADDRESS_IS_MAILBOX", type_id = "INTERNET_ADDRESS_MAILBOX")]
+[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddressMailbox", type_check_function = "INTERNET_ADDRESS_IS_MAILBOX", type_id = "INTERNET_ADDRESS_TYPE_MAILBOX")]
 public class InternetAddressMailbox : InternetAddress {
 	[CCode (cname = "internet_address_mailbox_new")]
 	public InternetAddressMailbox (string? name, string addr);
@@ -1411,7 +1411,7 @@ public class InternetAddressMailbox : InternetAddress {
 	[CCode (cname = "internet_address_mailbox_set_addr")]
 	public void set_addr (string addr);
 }
-[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddressList", type_check_function = "IS_INTERNET_ADDRESS_LIST", type_id = "INTERNET_ADDRESS_LIST")]
+[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddressList", type_check_function = "IS_INTERNET_ADDRESS_LIST", type_id = "INTERNET_ADDRESS_LIST_TYPE")]
 public class InternetAddressList : GLib.Object {
 	[CCode (cname = "internet_address_list_new")]
 	public InternetAddressList ();
diff --git a/vapi/gmime-2.6/gmime-2.6-custom.vala b/vapi/gmime-2.6/gmime-2.6-custom.vala
index 92167fdc..adb609ef 100644
--- a/vapi/gmime-2.6/gmime-2.6-custom.vala
+++ b/vapi/gmime-2.6/gmime-2.6-custom.vala
@@ -4,7 +4,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution. 
  */
 
-[CCode (cname="InternetAddress", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS", type_check_function="IS_INTERNET_ADDRESS")]
+[CCode (cname="InternetAddress", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_TYPE", type_check_function="IS_INTERNET_ADDRESS")]
 public class InternetAddress : GLib.Object {
     [CCode (cname="internet_address_get_name")]
     public unowned string? get_name();
@@ -14,7 +14,7 @@ public class InternetAddress : GLib.Object {
     public virtual string to_string(bool encoded);
 }
 
-[CCode (cname="InternetAddressGroup", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_GROUP", type_check_function="INTERNET_ADDRESS_IS_GROUP")]
+[CCode (cname="InternetAddressGroup", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_TYPE_GROUP", type_check_function="INTERNET_ADDRESS_IS_GROUP")]
 public class InternetAddressGroup : InternetAddress {
     [CCode (cname="internet_address_group_new")]
     public InternetAddressGroup(string name);
@@ -26,7 +26,7 @@ public class InternetAddressGroup : InternetAddress {
     public int add_member(InternetAddress member);
 }
 
-[CCode (cname="InternetAddressMailbox", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_MAILBOX", type_check_function="INTERNET_ADDRESS_IS_MAILBOX")]
+[CCode (cname="InternetAddressMailbox", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_TYPE_MAILBOX", type_check_function="INTERNET_ADDRESS_IS_MAILBOX")]
 public class InternetAddressMailbox : InternetAddress {
     [CCode (cname="internet_address_mailbox_new")]
     public InternetAddressMailbox(string? name, string addr);
@@ -36,7 +36,7 @@ public class InternetAddressMailbox : InternetAddress {
     public void set_addr(string addr);
 }
 
-[CCode (cname="InternetAddressList", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_LIST", type_check_function="IS_INTERNET_ADDRESS_LIST")]
+[CCode (cname="InternetAddressList", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_LIST_TYPE", type_check_function="IS_INTERNET_ADDRESS_LIST")]
 public class InternetAddressList : GLib.Object {
     [CCode (cname="internet_address_list_new")]
     public InternetAddressList();