diff --git a/examples/gmail/gmail.py b/examples/gmail/gmail.py
index 99a2c755..ad59c894 100755
--- a/examples/gmail/gmail.py
+++ b/examples/gmail/gmail.py
@@ -5,21 +5,20 @@ pygtk.require('2.0')
 import gtk
 import geckoembed
 
-from sugar.shell import activity
+from sugar.activity.Activity import Activity
 import sugar.env
 
 _GMAIL_ACTIVITY_TYPE = "_gmail_google._tcp"
 
-class GMailActivity(activity.Activity):
+class GMailActivity(Activity):
 	def __init__(self):
-		activity.Activity.__init__(self, _GMAIL_ACTIVITY_TYPE)
+		Activity.__init__(self, _GMAIL_ACTIVITY_TYPE)
 	
 	def on_connected_to_shell(self):
 		profile_path = os.path.join(sugar.env.get_user_dir(), 'gmail')
 		geckoembed.set_profile_path(profile_path)
 		self.set_tab_text("Mail")
 		self.set_tab_icon(name="stock_mail")
-		self.set_show_icon(True)
 
 		plug = self.gtk_plug()		
 
@@ -31,9 +30,6 @@ class GMailActivity(activity.Activity):
 		
 		embed.load_address("http://www.gmail.com")
 		
-	def on_disconnected_from_shell(self):
-		gtk.main_quit()
-		
 activity = GMailActivity()
 activity.connect_to_shell()