--- a/Makefile
+++ b/Makefile
@@ -12,24 +12,24 @@ translations:
 make-install-dirs: 
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
 	mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)
-	mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/gsentinel
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIBDIR)/gmail-sentinel
 	mkdir -p $(DESTDIR)$(PREFIX)/share/
-	mkdir -p $(DESTDIR)$(PREFIX)/share/gsentinel/
-	mkdir -p $(DESTDIR)$(PREFIX)/share/gsentinel/media/
+	mkdir -p $(DESTDIR)$(PREFIX)/share/gmail-sentinel/
+	mkdir -p $(DESTDIR)$(PREFIX)/share/gmail-sentinel/media/
 	mkdir -p $(DESTDIR)$(PREFIX)/share/locale
 
 install: make-install-dirs
-	install -m 644 *.py $(DESTDIR)$(PREFIX)$(LIBDIR)/gsentinel
-	install -m 644 media/* $(DESTDIR)$(PREFIX)/share/gsentinel/media
+	install -m 644 *.py $(DESTDIR)$(PREFIX)$(LIBDIR)/gmail-sentinel
+	install -m 644 media/* $(DESTDIR)$(PREFIX)/share/gmail-sentinel/media
 
 	cd $(DESTDIR)$(PREFIX)/bin && \
 	  /bin/echo -e \
 	    "#!/bin/sh\n" \
-	    "cd $(PREFIX)/share/gsentinel\n" \
-	    "exec python $(PREFIX)$(LIBDIR)/gsentinel/gsentinel.py \"\$$@\"" \
-	    > gsentinel && \
-	  chmod 755 gsentinel
-	for f in `find po -name gsentinel.mo` ; do \
+	    "cd $(PREFIX)/share/gmail-sentinel\n" \
+	    "exec python $(PREFIX)$(LIBDIR)/gmail-sentinel/gmail-sentinel.py \"\$$@\"" \
+	    > gmail-sentinel && \
+	  chmod 755 gmail-sentinel
+	for f in `find po -name gmail-sentinel.mo` ; do \
 	  install -d -m 755 \
 	    `echo $$f | sed "s|^po|$(DESTDIR)$(PREFIX)/share/locale|" | \
 	      xargs dirname` && \
@@ -43,7 +43,7 @@ clean:
 	rm -f messages.pot
 
 uninstall:
-	rm -rf $(DESTDIR)$(PREFIX)/bin/gsentinel
-	rm -rf $(DESTDIR)$(PREFIX)$(LIBDIR)/gsentinel
-	rm -rf $(DESTDIR)$(PREFIX)/share/gsentinel
-	find $(DESTDIR)$(PREFIX)/share/locale -name gsentinel.mo -exec rm -f {} \;
+	rm -rf $(DESTDIR)$(PREFIX)/bin/gmail-sentinel
+	rm -rf $(DESTDIR)$(PREFIX)$(LIBDIR)/gmail-sentinel
+	rm -rf $(DESTDIR)$(PREFIX)/share/gmail-sentinel
+	find $(DESTDIR)$(PREFIX)/share/locale -name gmail-sentinel.mo -exec rm -f {} \;

--- /dev/null
+++ b/gmail-sentinel.conf.sample
@@ -0,0 +1,24 @@
+# MAKE SURE YOU CHANGE AND UNCOMMENT THE BELOW OPTIONS TO SUIT YOUR
+# SYSTEM
+
+
+[gmail]
+# Your GoogleMail username (your email address without @gmail.com)
+username = gmail_username
+
+# Your GoogleMail password
+password = gmail_password
+
+# Check interval defines (in seconds) how often should GoogleMail
+# Sentinel should check for new mail in your inbox
+checkinterval = 60
+
+[media]
+# The path where is located the media (icons).
+path = /path/to/media/
+
+[options]
+# How much time (in seconds) should the popup be displayed
+popuptime = 5
+# Your favorite browser location
+browser = /usr/bin/firefox

--- /dev/null
+++ b/gmail-sentinel.py
@@ -0,0 +1,261 @@
+#! /usr/bin/env python
+# -*- coding: iso-8859-1 -*-
+#
+# Copyright (C) 2008 by Rodrigo Lazo
+#
+# This program 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 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+"""
+GoogleMail Sentinel. 
+
+Yet another GoogleMail Notifier. Checks your GoogleMail's inbox
+periodically for new mail using feeds(atom). This program creates an
+icon in the task bar when running and notifies about new mail through
+popups.
+"""
+
+
+import pygtk
+pygtk.require('2.0')
+import time
+import gtk
+import gobject
+import pynotify
+import locale, gettext
+import sys
+import os
+from os.path import dirname, pardir
+from gettext import gettext as _
+from ConfigParser import ConfigParser
+from gmailatom import GmailAtom
+
+APP_NAME = "Gmail-Sentinel"
+APP_VERSION = "0.1"
+APP_COPYRIGHT = "(C)2008 Rodrigo Lazo.\n" + _("GoogleMail and Gmail are trademarks of Google, Inc.")
+APP_DESCRIPTION = _('GoogleMail Sentinel')
+APP_WEBSITE = 'http://code.google.com/p/gmail-sentinel/'
+
+# Path definition
+SHARE_PATH = os.path.abspath(os.path.join(dirname(__file__), pardir, pardir, 'share'))
+LOCALE_PATH = os.path.join(SHARE_PATH, 'locale')
+
+# L10n initialization
+locale.setlocale(locale.LC_ALL, '')
+gettext.textdomain('gmail-sentinel')
+gettext.bindtextdomain('gmail-sentinel', LOCALE_PATH)
+
+class GmailNotification:
+    """ Notification pop-up. """
+
+    def __init__ (self, data, count, timeout, icon_file):
+        self.data = data
+        body = "<i>%s: </i>%s\n<i>%s: </i>%s\n%s" % (_("From"),
+                                                     self.data['sender'],
+                                                     _("Subject"),
+                                                     self.data['subject'],
+                                                     self.data["snippet"])
+        self.popup = pynotify.Notification(_("You have %d new messages")%count,
+                                           body)
+        self.popup.set_icon_from_pixbuf(gtk.gdk.pixbuf_new_from_file(icon_file))
+        self.popup.set_timeout(timeout)
+
+    def attach_to_status_icon (self, status_icon):
+        """ Make the popup appear from the WIDGET"""
+        self.popup.attach_to_status_icon(status_icon)
+
+    def show (self):
+        """ Displays the notification"""
+        self.popup.show()
+
+
+class GmailStatusIcon(gtk.StatusIcon):
+    """Status Icon for the system tray."""
+
+    def __init__(self, media_path):
+        gtk.StatusIcon.__init__(self)
+        self.current_icon_path = media_path
+        self.active_icon = os.path.join(self.current_icon_path,
+                                        'active.png')
+        self.inactive_icon = os.path.join(self.current_icon_path,
+                                          'inactive.png')
+	self.gmail_icon = os.path.join(self.current_icon_path,
+				       'gmail-icon.png')
+        menu = '''
+                <ui>
+                <menubar name="Menubar">
+                <menu action="Menu">
+                <menuitem action="About"/>
+                <menuitem action="Quit"/>
+                </menu>
+                </menubar>
+                </ui>
+        '''
+        actions = [
+                ('Menu',  None, _('Menu')),
+                ('About', gtk.STOCK_ABOUT, _('_About...'),
+                 None, _('About'), self.on_about),
+                ('Quit', gtk.STOCK_QUIT, _('_Quit'),
+                 None,_('Quit'), self.on_quit),
+                ]
+        ag = gtk.ActionGroup('Actions')
+        ag.add_actions(actions)
+        self.manager = gtk.UIManager()
+        self.manager.insert_action_group(ag, 0)
+        self.manager.add_ui_from_string(menu)
+        self.menu = self.manager.get_widget('/Menubar/Menu/About').props.parent
+        self.set_from_file(self.inactive_icon)
+        self.set_visible(True)
+        self.connect('popup-menu', self.on_popup_menu)
+
+    def on_quit(self, *args):
+        """Kills the application. Callback function."""
+        sys.exit()
+
+    def on_popup_menu(self, status, button, timing):
+        """Displays the popup menu."""
+        self.menu.popup(None, None, None, button, timing)
+
+    def on_about(self, data):
+        """Displays the about window"""
+        dialog = gtk.AboutDialog()
+        dialog.set_name(APP_NAME)
+        dialog.set_version(APP_VERSION)
+	dialog.set_copyright(APP_COPYRIGHT)
+        dialog.set_comments(APP_DESCRIPTION)
+        dialog.set_website(APP_WEBSITE)
+	dialog.set_logo(gtk.gdk.pixbuf_new_from_file(self.gmail_icon))
+        dialog.run()
+        dialog.destroy()
+
+    def set_from_file(self, path):
+        """Helper function to handle media path."""
+        if path != self.current_icon_path:
+            self.current_icon_path = path
+            gtk.StatusIcon.set_from_file(self, path)
+
+class Gnotify:
+    """Main class."""
+
+    def __init__ (self):
+        """Initializer. Creates the status icon and opens the
+        connection."""
+        self.config = ConfigParser()
+        self.connection = None
+        self.unread_msg_count = 0
+
+        if not self.load_configuration():
+            print "Configuration file does not exist."
+            sys.exit(1)
+
+        self.status_icon = GmailStatusIcon(self.config.get('media', 'path'))
+        # Make sure the status icon shows up
+        while gtk.events_pending():
+            gtk.main_iteration(True)
+        if self.connect() :
+            self.check_inbox()
+        # The multiplier is to simplify the configuration
+        # file. Converts the miliseconds into seconds
+        interval = int(self.config.get('gmail', 'checkinterval'))*1000
+        self.main_timer = gobject.timeout_add(interval, self.check_inbox)
+
+    def load_configuration (self):
+        """Loads the configuration. If file does not exist returns
+        false, if the configuration file is bad formatted it will die
+        loudly."""
+        filename = os.path.expanduser("~/.gmail-sentinel.conf")
+        if not os.path.exists(filename):
+            return False
+
+        self.config.read([filename])
+        return True
+
+    def connect (self):
+        """Creates a connection. The connection itself do the
+        parsing."""
+        if self.connection is None:
+            try:
+                print "connecting..."
+                self.status_icon.set_tooltip(_("Connecting..."))
+                self.connection = GmailAtom(self.config.get('gmail','username'),
+                                            self.config.get('gmail','password'))
+            except:
+                print "login failed, will retry"
+                self.status_icon.set_tooltip(_("Connection failed"))
+                return False
+        self.connection.refreshInfo()
+        print "connection successful... continuing"
+        self.status_icon.set_tooltip(_("Connected"))
+        return True
+
+    def check_inbox(self):
+        """Checks for new mail."""
+        # Revisar si esta el pop up y eliminarlo
+        if self.connection is None and self.connect() is False:
+            # Try again latter
+            return True
+        print "----------"
+        print "checking for new mail ("+time.strftime("%Y/%m/%d %H:%M:%S",
+                                                      time.localtime())+")"
+        while gtk.events_pending():
+            gtk.main_iteration( True )
+
+        if not self.has_new_mail():
+            # Check again later
+            self.unread_msg_count > 0 or \
+                self.status_icon.set_from_file(self.status_icon.inactive_icon)
+            return True
+        self.status_icon.set_from_file(self.status_icon.active_icon)
+        count = self.connection.getUnreadMsgCount()
+        last_message = self.get_last_message()
+        print "%s new messages" % count
+        # The multiplier is to simplify the configuration
+        # file. Converts the miliseconds into seconds
+        timeout = int(self.config.get('options', 'popuptime'))*1000
+        popup = GmailNotification(last_message, count, timeout,
+                                  self.status_icon.active_icon)
+        popup.attach_to_status_icon(self.status_icon)
+        popup.show()
+        return True
+
+    def has_new_mail (self):
+        """Checks if new mail has arrived."""
+        try:
+            # Hackerish?
+            self.connection.refreshInfo()
+            current_msg_count = self.connection.getUnreadMsgCount()
+            new_mail = current_msg_count > 0 and \
+                current_msg_count != self.unread_msg_count
+            self.unread_msg_count = current_msg_count
+            return new_mail
+        except:
+            print "getUnreadMsgCount() failed, will try again soon"
+            self.unread_msg_count = 0
+            return False
+
+    def get_last_message (self):
+        """ Returns the sender, subject and snippet of the last
+        message retrieved."""
+        return {'sender' : self.connection.getMsgAuthorName(0),
+                'subject' : self.connection.getMsgTitle(0),
+                'snippet' : self.connection.getMsgSummary(0)[:40] + "..."}
+
+    def main (self):
+        """ Mailoop"""
+        gtk.main()
+
+if __name__ == "__main__":
+    pynotify.init(APP_NAME)
+    notifier = Gnotify()
+    notifier.main()

--- a/gsentinel.conf.sample
+++ /dev/null
@@ -1,24 +0,0 @@
-# MAKE SURE YOU CHANGE AND UNCOMMENT THE BELOW OPTIONS TO SUIT YOUR
-# SYSTEM
-
-
-[gmail]
-# Your GoogleMail username (your email address without @gmail.com)
-username = gmail_username
-
-# Your GoogleMail password
-password = gmail_password
-
-# Check interval defines (in seconds) how often should GoogleMail
-# Sentinel should check for new mail in your inbox
-checkinterval = 60
-
-[media]
-# The path where is located the media (icons).
-path = /path/to/media/
-
-[options]
-# How much time (in seconds) should the popup be displayed
-popuptime = 5
-# Your favorite browser location
-browser = /usr/bin/firefox

--- a/gsentinel.py
+++ /dev/null
@@ -1,261 +0,0 @@
-#! /usr/bin/env python
-# -*- coding: iso-8859-1 -*-
-#
-# Copyright (C) 2008 by Rodrigo Lazo
-#
-# This program 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 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-"""
-GoogleMail Sentinel. 
-
-Yet another GoogleMail Notifier. Checks your GoogleMail's inbox
-periodically for new mail using feeds(atom). This program creates an
-icon in the task bar when running and notifies about new mail through
-popups.
-"""
-
-
-import pygtk
-pygtk.require('2.0')
-import time
-import gtk
-import gobject
-import pynotify
-import locale, gettext
-import sys
-import os
-from os.path import dirname, pardir
-from gettext import gettext as _
-from ConfigParser import ConfigParser
-from gmailatom import GmailAtom
-
-APP_NAME = "GSentinel"
-APP_VERSION = "0.1"
-APP_COPYRIGHT = "(C)2008 Rodrigo Lazo.\n" + _("GoogleMail is a trademark of Google, Inc.")
-APP_DESCRIPTION = _('GoogleMail Sentinel')
-APP_WEBSITE = 'http://rlazo.supersized.org/gnotify.html/'
-
-# Path definition
-SHARE_PATH = os.path.abspath(os.path.join(dirname(__file__), pardir, pardir, 'share'))
-LOCALE_PATH = os.path.join(SHARE_PATH, 'locale')
-
-# L10n initialization
-locale.setlocale(locale.LC_ALL, '')
-gettext.textdomain('gsentinel')
-gettext.bindtextdomain('gsentinel', LOCALE_PATH)
-
-class GmailNotification:
-    """ Notification pop-up. """
-
-    def __init__ (self, data, count, timeout, icon_file):
-        self.data = data
-        body = "<i>%s: </i>%s\n<i>%s: </i>%s\n%s" % (_("From"),
-                                                     self.data['sender'],
-                                                     _("Subject"),
-                                                     self.data['subject'],
-                                                     self.data["snippet"])
-        self.popup = pynotify.Notification(_("You have %d new messages")%count,
-                                           body)
-        self.popup.set_icon_from_pixbuf(gtk.gdk.pixbuf_new_from_file(icon_file))
-        self.popup.set_timeout(timeout)
-
-    def attach_to_status_icon (self, status_icon):
-        """ Make the popup appear from the WIDGET"""
-        self.popup.attach_to_status_icon(status_icon)
-
-    def show (self):
-        """ Displays the notification"""
-        self.popup.show()
-
-
-class GmailStatusIcon(gtk.StatusIcon):
-    """Status Icon for the system tray."""
-
-    def __init__(self, media_path):
-        gtk.StatusIcon.__init__(self)
-        self.current_icon_path = media_path
-        self.active_icon = os.path.join(self.current_icon_path,
-                                        'active.png')
-        self.inactive_icon = os.path.join(self.current_icon_path,
-                                          'inactive.png')
-	self.gmail_icon = os.path.join(self.current_icon_path,
-				       'gmail-icon.png')
-        menu = '''
-                <ui>
-                <menubar name="Menubar">
-                <menu action="Menu">
-                <menuitem action="About"/>
-                <menuitem action="Quit"/>
-                </menu>
-                </menubar>
-                </ui>
-        '''
-        actions = [
-                ('Menu',  None, _('Menu')),
-                ('About', gtk.STOCK_ABOUT, _('_About...'),
-                 None, _('About'), self.on_about),
-                ('Quit', gtk.STOCK_QUIT, _('_Quit'),
-                 None,_('Quit'), self.on_quit),
-                ]
-        ag = gtk.ActionGroup('Actions')
-        ag.add_actions(actions)
-        self.manager = gtk.UIManager()
-        self.manager.insert_action_group(ag, 0)
-        self.manager.add_ui_from_string(menu)
-        self.menu = self.manager.get_widget('/Menubar/Menu/About').props.parent
-        self.set_from_file(self.inactive_icon)
-        self.set_visible(True)
-        self.connect('popup-menu', self.on_popup_menu)
-
-    def on_quit(self, *args):
-        """Kills the application. Callback function."""
-        sys.exit()
-
-    def on_popup_menu(self, status, button, timing):
-        """Displays the popup menu."""
-        self.menu.popup(None, None, None, button, timing)
-
-    def on_about(self, data):
-        """Displays the about window"""
-        dialog = gtk.AboutDialog()
-        dialog.set_name(APP_NAME)
-        dialog.set_version(APP_VERSION)
-	dialog.set_copyright(APP_COPYRIGHT)
-        dialog.set_comments(APP_DESCRIPTION)
-        dialog.set_website(APP_WEBSITE)
-	dialog.set_logo(gtk.gdk.pixbuf_new_from_file(self.gmail_icon))
-        dialog.run()
-        dialog.destroy()
-
-    def set_from_file(self, path):
-        """Helper function to handle media path."""
-        if path != self.current_icon_path:
-            self.current_icon_path = path
-            gtk.StatusIcon.set_from_file(self, path)
-
-class Gnotify:
-    """Main class."""
-
-    def __init__ (self):
-        """Initializer. Creates the status icon and opens the
-        connection."""
-        self.config = ConfigParser()
-        self.connection = None
-        self.unread_msg_count = 0
-
-        if not self.load_configuration():
-            print "Configuration file does not exist."
-            sys.exit(1)
-
-        self.status_icon = GmailStatusIcon(self.config.get('media', 'path'))
-        # Make sure the status icon shows up
-        while gtk.events_pending():
-            gtk.main_iteration(True)
-        if self.connect() :
-            self.check_inbox()
-        # The multiplier is to simplify the configuration
-        # file. Converts the miliseconds into seconds
-        interval = int(self.config.get('gmail', 'checkinterval'))*1000
-        self.main_timer = gobject.timeout_add(interval, self.check_inbox)
-
-    def load_configuration (self):
-        """Loads the configuration. If file does not exist returns
-        false, if the configuration file is bad formatted it will die
-        loudly."""
-        filename = os.path.expanduser("~/.gsentinel.conf")
-        if not os.path.exists(filename):
-            return False
-
-        self.config.read([filename])
-        return True
-
-    def connect (self):
-        """Creates a connection. The connection itself do the
-        parsing."""
-        if self.connection is None:
-            try:
-                print "connecting..."
-                self.status_icon.set_tooltip(_("Connecting..."))
-                self.connection = GmailAtom(self.config.get('gmail','username'),
-                                            self.config.get('gmail','password'))
-            except:
-                print "login failed, will retry"
-                self.status_icon.set_tooltip(_("Connection failed"))
-                return False
-        self.connection.refreshInfo()
-        print "connection successful... continuing"
-        self.status_icon.set_tooltip(_("Connected"))
-        return True
-
-    def check_inbox(self):
-        """Checks for new mail."""
-        # Revisar si esta el pop up y eliminarlo
-        if self.connection is None and self.connect() is False:
-            # Try again latter
-            return True
-        print "----------"
-        print "checking for new mail ("+time.strftime("%Y/%m/%d %H:%M:%S",
-                                                      time.localtime())+&q