diff --git a/libtinymailui-mozembed/tny-moz-embed-msg-view.c b/libtinymailui-mozembed/tny-moz-embed-msg-view.c
index 8b394d1..3061149 100644
--- a/libtinymailui-mozembed/tny-moz-embed-msg-view.c
+++ b/libtinymailui-mozembed/tny-moz-embed-msg-view.c
@@ -83,8 +83,9 @@ tny_moz_embed_msg_view_create_mime_part_view_for_default (TnyMsgView *self, TnyM
 		GtkWidget *widget = (GtkWidget *) self;
 		retval = tny_moz_embed_html_mime_part_view_new (status_callback, status_user_data);
 
-		gtk_widget_set_usize (GTK_WIDGET (retval), 
-			widget->allocation.width>11?widget->allocation.width-10:1, 2500);
+		gtk_widget_set_size_request (GTK_WIDGET (retval),
+					     widget->allocation.width>11?widget->allocation.width-10:1,
+					     2500);
 	} else
 		retval = TNY_GTK_MSG_VIEW_CLASS (parent_class)->create_mime_part_view_for(self, part);
 
diff --git a/tests/c-demo/tny-demoui-summary-view.c b/tests/c-demo/tny-demoui-summary-view.c
index 6fd3596..14314e0 100644
--- a/tests/c-demo/tny-demoui-summary-view.c
+++ b/tests/c-demo/tny-demoui-summary-view.c
@@ -1697,7 +1697,7 @@ recursive_all_folders (GtkWidget *my_widget, GtkTreeModel *model, GtkTreeIter *i
 					G_CALLBACK (on_move_to_folder_activate), info);
 
 				gtk_widget_show (menuitem);
-				gtk_menu_prepend (menu, menuitem);
+				gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
 			}
 		}
 
@@ -1800,11 +1800,11 @@ mailbox_view_do_popup_menu (GtkWidget *my_widget, GdkEventButton *event, gpointe
 	g_signal_connect (G_OBJECT (mmerge), "activate",
 		G_CALLBACK (on_merge_view_activate), user_data);
 
-	gtk_menu_prepend (menu, mrename);
-	gtk_menu_prepend (menu, mcreate);
-	gtk_menu_prepend (menu, mdelete);
-	gtk_menu_prepend (menu, muncache);
-	gtk_menu_prepend (menu, mmerge);
+	gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), mrename);
+	gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), mcreate);
+	gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), mdelete);
+	gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), muncache);
+	gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), mmerge);
 	gtk_widget_show (mrename);
 	gtk_widget_show (mcreate);
 	gtk_widget_show (mdelete);
