--- /dev/null
+++ b/TODO
@@ -0,0 +1,46 @@
+* Better new messages control 
+
+  Right now, the code only counts how many messages are on the
+  inbox. The logic is simple, and flawed. If you had 4 new messages
+  and now you have 5, you have a new message. But what happend if you
+  read one message and a new message arrives? the count will still be
+  4 and the system won't report the new message. What should be done
+  is store the messages id in a <insert data structure> so you can
+  have a real control of the messages count.
+
+* See-them-all option
+
+  There should be an option to open all the new messages with a single
+  click. If you use firefox, you may want to open in new tabs all your
+  messages, that would be nice.
+
+* Go to Google Mail homepage option
+  
+  The title says all.
+
+* A plugin system
+
+  Right now gmail-sentinel is a monolithic design. What should be done
+  is to provide "callbacks" so you can register a plugin. What would
+  be ideal is to have this hooks
+
+  1.- Pre-connection (*)
+  2.- Pre-parsing (*Before parsing the atom feed)
+  3.- New message
+  4.- No message
+
+  Ideally, the notifications will use this plugin system. (* allowing
+  content modification before the parsing could be a security issue,
+  and pre-connection activities are discussible also. This is a
+  brainstorm so everything is changeable.)
+
+* Notification "skins"
+  
+  Some ideas
+
+  - "full" see open/next/previous buttons and from/subject/summary data
+  - "minimal" just -> you have <n> new messages
+  - "medium" see open/next/previous buttons and from/subject data
+  - "last" see from/subject/summary data
+
+  and so on

--- a/gmail-sentinel.py
+++ b/gmail-sentinel.py
@@ -217,15 +217,18 @@ class Gnotify:
                 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
+	if self.connection.refreshInfo():
+	    print "connection successful... continuing"
+	    self.status_icon.set_tooltip(_("Connected"))
+	    return True
+	else:
+	    print "connection failed"
+	    self.status_icon.set_tooltip(_("Not connected"))
+	    return False
 
     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:
+        if self.connection is None or self.connect() is False:
             # Try again latter
             return True
         print "----------"

--- a/gmailatom.py
+++ b/gmailatom.py
@@ -161,12 +161,16 @@ class GmailAtom:
     def sendRequest(self):
         """Opens a conection with the remote server"""
         del self.mh.entries[:]
-        return urllib2.urlopen(self.url)
+	return urllib2.urlopen(self.url)
 
     def refreshInfo(self):
         """Requests information from the remote server and parses the
         information retrieved"""
-        sax.parseString( self.sendRequest().read(), self.mh)
+	try:
+	    sax.parseString( self.sendRequest().read(), self.mh)
+	    return True
+	except urllib2.URLError:
+	    return False
 
     def getMsgList (self):
         """Returns a list containing the new messages or empty. It