mail-notification

Fork of Jean-Yves Lefort's mail-notification, a tray icon to notify of new mail
git clone https://code.djc.id.au/git/mail-notification/
commit 4e15c31f6ecbf82043494043d83ca8bd4a6a951e
parent 250fff98fd565c625bdc8d7542efecc0ce3e990a
Author: Jean-Yves Lefort <jylefort@brutele.be>
Date:   Mon,  7 Mar 2005 07:41:41 +1000

mail-notification-1.1

* IMAP changes:
        * is more tolerant towards uncompliant FETCH responses
        * ignores case of responses (RFC 3501)
        * makes sure the server responses are valid ASCII (RFC
          3501)

* Gmail changes:
        * properly converts timestamps (requires ICU)
        * handles timestamps from previous years
        * displays all the messages of a conversation

* POP3 and IMAP changes:
        * does not loop infinitely when no password is
          specified, an authentication mechanism is specified
          and authentication fails
        * does not abort when a SASL authentication mechanism
          is specified and the server does not support any
          SASL authentication mechanism

* POP3 and Gmail changes:
        * makes sure the server responses are valid UTF-8

* The mail summary dialog has been replaced by a main window,
  for controlling Mail Notification when the status icon is
  hidden
* Added "update the mail status" double-click action
* The tooltip mailbox lists (Mailboxes Having New Mail,
  Errors, Unsupported Mailboxes) are now sorted
* GMime is now mandatory for mbox, MH, Maildir, Sylpheed, POP3
  and IMAP mailbox support
* The --quit command line argument has been added
* Minor fixes and cleanups

* Updated translations:
        * Polish (Maurycy Pawłowski-Wieroński)
        * Serbian (Filip Miletic)
        * Portuguese (Duarte Henriques)
        * German (Hendrik Brandt)

Diffstat:
MAUTHORS | 10++++++++--
MINSTALL | 51++++++++++++++++++++++++++++++++++-----------------
MMakefile.in | 14++++++++++----
MNEWS | 41+++++++++++++++++++++++++++++++++++++++++
MREADME | 26++++++++++++++++++++++----
MTODO | 4++++
Macinclude.m4 | 25+++++++++++++++++++------
Maclocal.m4 | 5+++--
Mart/Makefile.am | 16+++++++---------
Mart/Makefile.in | 29+++++++++++++++++------------
Aart/hand-open.png | 0
Aart/main-window.png | 0
Mconfig.h.in | 9+++------
Mconfigure | 663++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
Mconfigure.ac | 69++++++++++++++++++++++++++++++++++++++++++++-------------------------
Mdata/Makefile.in | 14++++++++++----
Mdata/mail-notification-properties.desktop.in | 2++
Mdata/mail-notification.desktop.in | 5++++-
Mdata/mail-notification.schemas.in | 120++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------
Mhelp/C/Makefile.in | 14++++++++++----
Mhelp/C/mail-notification-C.omf | 4++--
Mhelp/C/mail-notification.xml | 240++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mhelp/Makefile.in | 14++++++++++----
Mm4/Makefile.in | 14++++++++++----
Am4/icu.m4 | 67+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mm4/openssl.m4 | 4+---
Mm4/sasl2.m4 | 4+---
Mpo/POTFILES.in | 23+++++++++++++++--------
Mpo/bg.gmo | 0
Mpo/bg.po | 919++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mpo/de.gmo | 0
Mpo/de.po | 962+++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
Mpo/fr.gmo | 0
Mpo/fr.po | 954+++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
Mpo/mail-notification.pot | 845++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mpo/pl.gmo | 0
Mpo/pl.po | 1183++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mpo/pt.gmo | 0
Mpo/pt.po | 1018+++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
Mpo/ru.gmo | 0
Mpo/ru.po | 868++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mpo/sr.gmo | 0
Mpo/sr.po | 1019+++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
Mpo/sr@Latn.gmo | 0
Mpo/sr@Latn.po | 1019+++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
Msrc/MNAutomation.idl | 5+++--
Msrc/Makefile.am | 56++++++++++++++++++++++++++++++++++++++++++--------------
Msrc/Makefile.in | 146+++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
Asrc/egg-editable-toolbar.c | 1468+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/egg-editable-toolbar.h | 92+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/egg-toolbar-editor.c | 710+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/egg-toolbar-editor.h | 67+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/egg-toolbars-model.c | 830+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/egg-toolbars-model.h | 149+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/eggmarshalers.c | 679+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/eggmarshalers.h | 151++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/eggmarshalers.list | 20++++++++++++++++++++
Msrc/ent2h.sh | 4++--
Msrc/mn-about-dialog.c | 21++++++++-------------
Msrc/mn-about-dialog.gob | 11+++--------
Msrc/mn-auth-combo-box.c | 47++++++++++++++++++++++++-----------------------
Msrc/mn-auth-combo-box.gob | 9+++++----
Msrc/mn-authenticated-mailbox-private.h | 4++--
Msrc/mn-authenticated-mailbox.c | 84+++++++++++++++++++++++++++++++++++++++++--------------------------------------
Msrc/mn-authenticated-mailbox.gob | 11++++++++---
Msrc/mn-authenticated-mailbox.h | 1+
Msrc/mn-autodetect-mailbox-properties-private.h | 8++++----
Msrc/mn-autodetect-mailbox-properties.c | 192+++++++++++++++++++++++++++++++++++++++++++++----------------------------------
Msrc/mn-autodetect-mailbox-properties.gob | 75+++++++++++++++++++++++++++++++++++++++++++++++----------------------------
Msrc/mn-automation.c | 73++++++++++++++++++++++++++++++++++++++++++++++---------------------------
Msrc/mn-automation.gob | 21++++++++++++++-------
Msrc/mn-blinking-image.c | 2+-
Msrc/mn-blinking-image.gob | 2+-
Msrc/mn-client-session.c | 69++++++++++++++++++++++++++++++++++++++++++++-------------------------
Msrc/mn-client-session.h | 8+++++++-
Msrc/mn-conf.c | 769+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
Msrc/mn-conf.h | 67+++++++++++++++++++++++++++----------------------------------------
Msrc/mn-gmail-mailbox-private.h | 4++--
Msrc/mn-gmail-mailbox-properties-private.h | 10++++------
Msrc/mn-gmail-mailbox-properties.c | 106+++++++++++++++++++++++++++++++++++++------------------------------------------
Msrc/mn-gmail-mailbox-properties.gob | 17++++++++---------
Msrc/mn-gmail-mailbox.c | 625++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
Msrc/mn-gmail-mailbox.gob | 250++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
Msrc/mn-gmime-stream-vfs.c | 2+-
Msrc/mn-gmime-stream-vfs.gob | 2+-
Asrc/mn-icu.c | 83+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/mn-icu.h | 30++++++++++++++++++++++++++++++
Msrc/mn-imap-mailbox-private.h | 6+++---
Msrc/mn-imap-mailbox-properties-private.h | 8++++----
Msrc/mn-imap-mailbox-properties.c | 50+++++++++++++++++++++++++-------------------------
Msrc/mn-imap-mailbox-properties.gob | 22+++++++++++-----------
Msrc/mn-imap-mailbox.c | 912++++++++++++++++++++++++++++++++++---------------------------------------------
Msrc/mn-imap-mailbox.gob | 247+++++++++++++++++++++++++------------------------------------------------------
Msrc/mn-mail-icon.c | 225++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Msrc/mn-mail-icon.gob | 46++++++++++++++++++++++++++++++++++++++--------
Msrc/mn-mail-icon.h | 14+++++++-------
Msrc/mn-mailbox-private.h | 23+++++++++++------------
Msrc/mn-mailbox-properties-dialog.c | 94++++++++++++++++++++++++++++++++++++++++++-------------------------------------
Msrc/mn-mailbox-properties-dialog.h | 14+++-----------
Msrc/mn-mailbox-properties-util.c | 2+-
Msrc/mn-mailbox-properties-util.h | 2+-
Msrc/mn-mailbox-properties.c | 2+-
Msrc/mn-mailbox-properties.h | 2+-
Msrc/mn-mailbox-view.c | 416+++++++++++++++++++++++++++++++++++++++++--------------------------------------
Msrc/mn-mailbox-view.gob | 46+++++++++++++++++++++++++++++-----------------
Msrc/mn-mailbox.c | 424+++++++++++++++++++++++++++++++++++++------------------------------------------
Msrc/mn-mailbox.gob | 36+++++++++++++++++++++++-------------
Msrc/mn-mailbox.h | 7-------
Msrc/mn-mailboxes.c | 504+++++++++++++++++++++++++++++++------------------------------------------------
Msrc/mn-mailboxes.gob | 89+++++++++++++++++++------------------------------------------------------------
Msrc/mn-mailboxes.h | 9---------
Msrc/mn-maildir-mailbox.c | 82+++++++++++++++++++++++++++++--------------------------------------------------
Msrc/mn-maildir-mailbox.gob | 28+++-------------------------
Asrc/mn-main-window.c | 1007+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/mn-main-window.h | 29+++++++++++++++++++++++++++++
Msrc/mn-main.c | 149++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Msrc/mn-mbox-mailbox-private.h | 2+-
Msrc/mn-mbox-mailbox.c | 106+++++++++++++++++++++++--------------------------------------------------------
Msrc/mn-mbox-mailbox.gob | 50++------------------------------------------------
Dsrc/mn-message-box-private.h | 32--------------------------------
Dsrc/mn-message-box.c | 584-------------------------------------------------------------------------------
Dsrc/mn-message-box.gob | 233-------------------------------------------------------------------------------
Dsrc/mn-message-box.h | 87-------------------------------------------------------------------------------
Msrc/mn-message-mime.c | 2+-
Msrc/mn-message-mime.h | 2+-
Asrc/mn-message-view-private.h | 34++++++++++++++++++++++++++++++++++
Asrc/mn-message-view.c | 819+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/mn-message-view.gob | 404+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/mn-message-view.h | 84+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Msrc/mn-message.c | 172+++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
Msrc/mn-message.gob | 50++++++++++++++++++++++++++++++++++++++++++++++++--
Msrc/mn-message.h | 1+
Msrc/mn-mh-mailbox.c | 101++++++++++++++++++++++++-------------------------------------------------------
Msrc/mn-mh-mailbox.gob | 45+++------------------------------------------
Msrc/mn-pending-mailbox.c | 2+-
Msrc/mn-pending-mailbox.gob | 2+-
Msrc/mn-pi-mailbox-properties.c | 122++++++++++++++++++++++++++++++++++++++-----------------------------------------
Msrc/mn-pi-mailbox-properties.gob | 9++++-----
Msrc/mn-pi-mailbox-properties.h | 1-
Msrc/mn-pop3-mailbox-private.h | 4++--
Msrc/mn-pop3-mailbox-properties.c | 46+++++++++++++++++++++++-----------------------
Msrc/mn-pop3-mailbox-properties.gob | 18+++++++++---------
Msrc/mn-pop3-mailbox.c | 804++++++++++++++++++++++++++++++++++++-------------------------------------------
Msrc/mn-pop3-mailbox.gob | 238+++++++++++++++++++++++++++++++++----------------------------------------------
Asrc/mn-properties-dialog.c | 514+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/mn-properties-dialog.h | 32++++++++++++++++++++++++++++++++
Dsrc/mn-properties.c | 445-------------------------------------------------------------------------------
Dsrc/mn-properties.h | 24------------------------
Msrc/mn-sasl.c | 2+-
Msrc/mn-sasl.h | 2+-
Msrc/mn-sgml-ref.c | 81+++++++++++++++++++++++++++++++++++++++++--------------------------------------
Msrc/mn-sgml-ref.h | 2+-
Msrc/mn-shell-private.h | 14++++++++------
Msrc/mn-shell.c | 929++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------
Msrc/mn-shell.gob | 398+++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------
Msrc/mn-shell.h | 48++++++++++++++++++++++++++++++++++++++++++++++--
Msrc/mn-soup.c | 2+-
Msrc/mn-soup.h | 2+-
Msrc/mn-ssl.c | 2+-
Msrc/mn-ssl.h | 2+-
Msrc/mn-stock.c | 38++++++++++++++++++++++++++------------
Msrc/mn-stock.h | 5++++-
Dsrc/mn-summary-dialog.c | 170-------------------------------------------------------------------------------
Dsrc/mn-summary-dialog.h | 27---------------------------
Msrc/mn-summary-popup.c | 285+++++++++++++++++++++++++++++++++++++++----------------------------------------
Msrc/mn-summary-popup.h | 2+-
Dsrc/mn-summary.c | 56--------------------------------------------------------
Dsrc/mn-summary.h | 26--------------------------
Msrc/mn-sylpheed-mailbox.c | 97+++++++++++++++++++++++++++++++------------------------------------------------
Msrc/mn-sylpheed-mailbox.gob | 27+++------------------------
Msrc/mn-system-mailbox-properties.c | 2+-
Msrc/mn-system-mailbox-properties.gob | 2+-
Msrc/mn-tooltips.c | 237++++++++++++++++++++++++++++++++++++++-----------------------------------------
Msrc/mn-tooltips.gob | 21++++++---------------
Msrc/mn-unsupported-mailbox.c | 2+-
Msrc/mn-unsupported-mailbox.gob | 2+-
Msrc/mn-uri.c | 75++++++++++++++++++++++++++++++++++++++-------------------------------------
Msrc/mn-uri.gob | 5+++--
Msrc/mn-util.c | 360+++++++++++++++++++++++++++++++++++++++++++++----------------------------------
Msrc/mn-util.h | 56++++++++++++++++++++++++--------------------------------
Msrc/mn-vfs.c | 2+-
Msrc/mn-vfs.h | 2+-
Mtests/Makefile.am | 10++++++++++
Mtests/Makefile.in | 55+++++++++++++++++++++++++++++++++++++++++++++++--------
Atests/test-sgml-ref.c | 51+++++++++++++++++++++++++++++++++++++++++++++++++++
Mtests/test-uri.c | 2+-
Mtests/test-vfs-read-line.c | 2+-
Mui/Makefile.am | 24++++++++++++------------
Mui/Makefile.in | 42+++++++++++++++++++++++++-----------------
Mui/authentication.glade | 7+++----
Aui/edit-toolbars.glade | 159+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Aui/edit-toolbars.gladep | 14++++++++++++++
Aui/main.glade | 93+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Aui/main.gladep | 14++++++++++++++
Aui/menus.xml | 36++++++++++++++++++++++++++++++++++++
Mui/properties.glade | 478++++++++++++++++++++++++++++++++++---------------------------------------------
Dui/summary-dialog.glade | 247-------------------------------------------------------------------------------
Dui/summary-dialog.gladep | 14--------------
Mui/summary-popup.glade | 9++++++---
Aui/toolbars.xml | 16++++++++++++++++
Mui/welcome.glade | 5++---
201 files changed, 20147 insertions(+), 10932 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -12,10 +12,16 @@ Contributors:
 	* Filip Miletic <filmil@gmail.com> (Serbian translations)
 	* Vladimir Petkov <vpetkov@i-space.org> (Bulgarian
 	  translations)
-	* Tomasz Sarota-Raczek <tomasz.sarota.raczek@gmail.com>
+	* Tomasz Sarota-Raczek <tomasz.sarota.raczek@gmail.com>,
+	  Maurycy Pawłowski-Wieroński <maurycy@abstrakcja.pl>
 	  (Polish translations)
 
-External art sources:
+External code sources:
+	* libegg (src/egg*)
+
+External art sources (images taken as-is or slightly modified):
 	* Google (gmail.png)
 	* Evolution (mail-notification.png)
 	* GTK+ (unsupported.png)
+	* GNOME Icon Theme (main-window.png)
+	* libegg (hand-open.png)
diff --git a/INSTALL b/INSTALL
@@ -11,9 +11,9 @@ Index
 
 0. About this document
 
-	$Id: INSTALL,v 1.14 2004/10/25 13:03:00 jylefort Exp $
+	$Id: INSTALL,v 1.17 2005/03/01 01:43:58 jylefort Exp $
 
-	Copyright (c) 2003, 2004 Jean-Yves Lefort.
+	Copyright (C) 2003-2005 Jean-Yves Lefort.
 
 	This document is part of Mail Notification.
 	It may be distributed under the same terms as Mail Notification.
@@ -30,11 +30,21 @@ Index
 
 	Optional libraries:
 
+		* for mbox, MH, Maildir, POP3, IMAP and Sylpheed support:
+
+		  GMime (version 2.1.0 or superior)
+		  http://spruce.sourceforge.net/gmime/
+
 		* for Gmail support:
 
 		  GNOME (version 2.8.0 or superior)
 		  http://www.gnome.org/
 
+		* for Gmail timestamps support:
+
+		  ICU (version 2.6 or superior)
+		  http://ibm.com/software/globalization/icu/
+
 		* for SSL/TLS support:
 
 		  OpenSSL (version 0.9.5b or superior)
@@ -45,11 +55,6 @@ Index
 		  Cyrus SASL (version 2.0 or superior)
 		  http://asg.web.cmu.edu/sasl/sasl-library.html
 
-		* for MIME support:
-
-		  GMime (version 2.1.0 or superior)
-		  http://spruce.sourceforge.net/gmime/
-
 2. Instructions
 
 	Mail Notification uses the well-known GNU build system. Hence,
@@ -83,22 +88,32 @@ Index
 
 		Enable mbox mailbox support.
 
+		Requirements: GMime version 2.1.0 or superior.
+
 	--enable-mh (default: yes)
 
 		Enable MH mailbox support.
 
+		Requirements: GMime version 2.1.0 or superior.
+
 	--enable-maildir (default: yes)
 
 		Enable Maildir mailbox support.
 
+		Requirements: GMime version 2.1.0 or superior.
+
 	--enable-pop3 (default: yes)
 
 		Enable POP3 mailbox support.
 
+		Requirements: GMime version 2.1.0 or superior.
+
 	--enable-imap (default: yes)
 
 		Enable IMAP mailbox support.
 
+		Requirements: GMime version 2.1.0 or superior.
+
 	--enable-ssl (default: yes)
 
 		Enable SSL/TLS support.
@@ -115,7 +130,9 @@ Index
 
 	--enable-sylpheed (default: yes)
 
-		Enable Sylpheed format support.
+		Enable Sylpheed mailbox support.
+
+		Requirements: GMime version 2.1.0 or superior.
 
 	--enable-gmail (default: yes)
 
@@ -123,17 +140,17 @@ Index
 
 		Requirements: GNOME version 2.8.0 or superior.
 
-	--enable-ipv6 (default: yes)
+	--enable-gmail-timestamps (default: yes)
 
-		Enable IPv6 support.
+		Enable Gmail timestamps support. If this option is
+		disabled, Mail Notification will not be able to
+		display the timestamps of Gmail messages.
 
-		Applies to: POP3, IMAP.
+		Requirements: GNOME version 2.8.0 or superior.
+		Applies to: Gmail.
 
-	--enable-mime (default: yes)
+	--enable-ipv6 (default: yes)
 
-		Enable MIME support. If this option is disabled, the
-		mail summary will not be able to display messages of
-		mbox, MH, Maildir, POP3, IMAP and Sylpheed mailboxes.
+		Enable IPv6 support.
 
-		Requirements: GMime version 2.0 or superior.
-		Applies to: mbox, MH, Maildir, POP3, IMAP, Sylpheed.
+		Applies to: POP3, IMAP.
diff --git a/Makefile.in b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40,9 +40,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	compile config.guess config.sub depcomp install-sh missing \
 	mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
-	$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/icu.m4 \
+	$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -103,6 +103,7 @@ GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMIME_CFLAGS = @GMIME_CFLAGS@
 GMIME_LIBS = @GMIME_LIBS@
 GMOFILES = @GMOFILES@
@@ -113,6 +114,9 @@ GOB2 = @GOB2@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 ICONV = @ICONV@
+ICU_CFLAGS = @ICU_CFLAGS@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_LIBS = @ICU_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -179,6 +183,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
+WITH_GMAIL_TIMESTAMPS_FALSE = @WITH_GMAIL_TIMESTAMPS_FALSE@
+WITH_GMAIL_TIMESTAMPS_TRUE = @WITH_GMAIL_TIMESTAMPS_TRUE@
 WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
 WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
 WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
diff --git a/NEWS b/NEWS
@@ -1,3 +1,44 @@
+1.1					March 6, 2005
+
+	* IMAP fixes:
+		* is more tolerant towards uncompliant FETCH responses
+		* ignores case of responses (RFC 3501)
+		* makes sure the server responses are valid ASCII (RFC
+		  3501)
+
+	* Gmail fixes:
+		* properly converts timestamps (requires ICU)
+		* handles timestamps from previous years
+		* displays all the messages of a conversation
+
+	* POP3 and IMAP fixes:
+		* does not loop infinitely when no password is
+		  specified, an authentication mechanism is specified
+		  and authentication fails
+		* does not abort when a SASL authentication mechanism
+		  is specified and the server does not support any
+		  SASL authentication mechanism
+
+	* POP3 and Gmail fixes:
+		* makes sure the server responses are valid UTF-8
+
+	* The mail summary dialog has been replaced by a main window,
+	  for controlling Mail Notification when the status icon is
+	  hidden
+	* Added "update the mail status" double-click action
+	* The tooltip mailbox lists (Mailboxes Having New Mail,
+	  Errors, Unsupported Mailboxes) are now sorted
+	* GMime is now mandatory for mbox, MH, Maildir, Sylpheed, POP3
+	  and IMAP mailbox support
+	* The --quit command line argument has been added
+	* Minor fixes and cleanups
+
+	* Updated translations:
+		* Polish (Maurycy Pawłowski-Wieroński)
+		* Serbian (Filip Miletic)
+		* Portuguese (Duarte Henriques)
+		* German (Hendrik Brandt)
+
 1.0					November 25, 2004
 
 	* Some minor IMAP issues have been fixed
diff --git a/README b/README
@@ -6,13 +6,14 @@ Index
 
 	0. About this document
 	1. About Mail Notification
-	2. Installation instructions
+	2. Issues in third-party software affecting Mail Notification
+	3. Installation instructions
 
 0. About this document
 
-	$Id: README,v 1.23 2004/10/25 13:03:00 jylefort Exp $
+	$Id: README,v 1.25 2005/03/01 16:55:41 jylefort Exp $
 
-	Copyright (c) 2003, 2004 Jean-Yves Lefort.
+	Copyright (C) 2003-2005 Jean-Yves Lefort.
 
 	This document is part of Mail Notification.
 	It may be distributed under the same terms as Mail Notification.
@@ -41,6 +42,23 @@ Index
 		* a mail summary
 		* HIG 2.0 compliance
 
-2. Installation instructions
+2. Issues in third-party software affecting Mail Notification
+
+	As of March 1, 2005, the following issues are unfixed, and may
+	cause Mail Notification (and other GNOME multi-threaded
+	programs) to crash or hang.
+
+	* thread-safety bug in GLib:
+	  http://bugzilla.gnome.org/show_bug.cgi?id=64764
+
+	  Reported on 2001-11-17, maintainers apparently do not care.
+
+	* thread-safety bugs in libgnomeui:
+	  http://bugzilla.gnome.org/show_bug.cgi?id=152023
+
+	  Reported on 2004-09-06, patches provided, maintainers
+	  apparently do not care.
+
+3. Installation instructions
 
 	See the INSTALL file.
diff --git a/TODO b/TODO
@@ -4,3 +4,7 @@
 * See if we can add an Evolution data server mailbox backend
 
 * List the available IMAP folders in the mailbox properties dialog
+
+* Allow to set a different mail reader for each mailbox. Invoking the
+  mail reader action would run the mail reader of the most recent
+  message's mailbox, or fallback to the global mail reader.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -1,6 +1,4 @@
-# $Id: acinclude.m4,v 1.13 2004/09/29 22:15:14 jylefort Exp $
-#
-# Copyright (c) 2003, 2004 Jean-Yves Lefort.
+# Copyright (C) 2003-2005 Jean-Yves Lefort.
 #
 # This file is part of Mail Notification.
 # It may be distributed under the same terms as Mail Notification.
@@ -72,8 +70,23 @@ esac], [enable_compile_warnings=no])
 if test $enable_compile_warnings = no; then
 	WARN_CFLAGS=
 else
-	# some flags are specific to GCC
-	WARN_CFLAGS="-Wall -Wcast-align -Wredundant-decls -Wnested-externs -Winline"
+	# most flags are specific to GCC
+	WARN_CFLAGS="-Wall \
+-Wformat-y2k \
+-Wformat-security \
+-Wno-unused-parameter \
+-Wfloat-equal \
+-Wdeclaration-after-statement \
+-Wendif-labels \
+-Wpointer-arith \
+-Wcast-align \
+-Waggregate-return \
+-Wmissing-noreturn \
+-Wmissing-format-attribute \
+-Wpacked \
+-Wredundant-decls \
+-Wnested-externs \
+-Winline"
 	test $enable_compile_warnings = error && WARN_CFLAGS="$WARN_CFLAGS -Werror"
 fi
 
@@ -83,7 +96,7 @@ AC_SUBST(WARN_CFLAGS)])
 
 dnl MN_REPORT(NAME, VALUE)
 dnl
-AC_DEFUN([MN_REPORT], [  m4_format([%-20s %s], [$1], [$2])])
+AC_DEFUN([MN_REPORT], [  m4_format([%-30s %s], [$1], [$2])])
 
 dnl MN_REPORT_ARG(NAME)
 dnl
diff --git a/aclocal.m4 b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.4 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
@@ -668,7 +668,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.2])])
+	 [AM_AUTOMAKE_VERSION([1.9.4])])
 
 # AM_AUX_DIR_EXPAND
 
@@ -1710,6 +1710,7 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/icu.m4])
 m4_include([m4/openssl.m4])
 m4_include([m4/sasl2.m4])
 dnl AM_GCONF_SOURCE_2
diff --git a/art/Makefile.am b/art/Makefile.am
@@ -1,12 +1,10 @@
-GNOME_IMAGES = mail-notification.png
-APP_IMAGES = \
-	logo.png		\
-	gmail.png		\
-	mail-notification.png	\
-	unsupported.png
-
 gnome_pixmapsdir = $(datadir)/pixmaps
-dist_gnome_pixmaps_DATA = $(GNOME_IMAGES)
+dist_gnome_pixmaps_DATA = mail-notification.png
 
 app_pixmapsdir = $(pkgdatadir)/ui
-dist_app_pixmaps_DATA = $(APP_IMAGES)
+dist_app_pixmaps_DATA = \
+	gmail.png		\
+	hand-open.png		\
+	logo.png		\
+	main-window.png		\
+	unsupported.png
diff --git a/art/Makefile.in b/art/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,9 +38,9 @@ subdir = art
 DIST_COMMON = $(dist_app_pixmaps_DATA) $(dist_gnome_pixmaps_DATA) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
-	$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/icu.m4 \
+	$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -91,6 +91,7 @@ GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMIME_CFLAGS = @GMIME_CFLAGS@
 GMIME_LIBS = @GMIME_LIBS@
 GMOFILES = @GMOFILES@
@@ -101,6 +102,9 @@ GOB2 = @GOB2@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 ICONV = @ICONV@
+ICU_CFLAGS = @ICU_CFLAGS@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_LIBS = @ICU_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -167,6 +171,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
+WITH_GMAIL_TIMESTAMPS_FALSE = @WITH_GMAIL_TIMESTAMPS_FALSE@
+WITH_GMAIL_TIMESTAMPS_TRUE = @WITH_GMAIL_TIMESTAMPS_TRUE@
 WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
 WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
 WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
@@ -222,17 +228,16 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-GNOME_IMAGES = mail-notification.png
-APP_IMAGES = \
-	logo.png		\
+gnome_pixmapsdir = $(datadir)/pixmaps
+dist_gnome_pixmaps_DATA = mail-notification.png
+app_pixmapsdir = $(pkgdatadir)/ui
+dist_app_pixmaps_DATA = \
 	gmail.png		\
-	mail-notification.png	\
+	hand-open.png		\
+	logo.png		\
+	main-window.png		\
 	unsupported.png
 
-gnome_pixmapsdir = $(datadir)/pixmaps
-dist_gnome_pixmaps_DATA = $(GNOME_IMAGES)
-app_pixmapsdir = $(pkgdatadir)/ui
-dist_app_pixmaps_DATA = $(APP_IMAGES)
 all: all-am
 
 .SUFFIXES:
diff --git a/art/hand-open.png b/art/hand-open.png
Binary files differ.
diff --git a/art/main-window.png b/art/main-window.png
Binary files differ.
diff --git a/config.h.in b/config.h.in
@@ -45,9 +45,6 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* Define to 1 if you have the `timegm' function. */
-#undef HAVE_TIMEGM
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
@@ -72,15 +69,15 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
 /* Version number of package */
 #undef VERSION
 
 /* Define to 1 if [gmail] is enabled */
 #undef WITH_GMAIL
 
+/* Define to 1 if [gmail-timestamps] is enabled */
+#undef WITH_GMAIL_TIMESTAMPS
+
 /* Define to 1 if [imap] is enabled */
 #undef WITH_IMAP
 
diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for mail-notification 1.0.
+# Generated by GNU Autoconf 2.59 for mail-notification 1.1.
 #
 # Report bugs to <jylefort@brutele.be>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='mail-notification'
 PACKAGE_TARNAME='mail-notification'
-PACKAGE_VERSION='1.0'
-PACKAGE_STRING='mail-notification 1.0'
+PACKAGE_VERSION='1.1'
+PACKAGE_STRING='mail-notification 1.1'
 PACKAGE_BUGREPORT='jylefort@brutele.be'
 
 ac_unique_file="src/mn-main.c"
@@ -311,7 +311,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WARN_CFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GETTEXT_PACKAGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGMERGE PKG_CONFIG GTK_CFLAGS GTK_LIBS GNOME_CFLAGS GNOME_LIBS GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GCONFTOOL ORBIT_IDL LIBBONOBO_IDL BONOBO_ACTIVATION_IDL GOB2 OPENSSL_CFLAGS OPENSSL_LIBS SASL_CFLAGS SASL_LIBS SOUP_CFLAGS SOUP_LIBS GMIME_CFLAGS GMIME_LIBS WITH_MBOX_TRUE WITH_MBOX_FALSE WITH_MH_TRUE WITH_MH_FALSE WITH_MAILDIR_TRUE WITH_MAILDIR_FALSE WITH_POP3_TRUE WITH_POP3_FALSE WITH_IMAP_TRUE WITH_IMAP_FALSE WITH_POP3_OR_IMAP_TRUE WITH_POP3_OR_IMAP_FALSE WITH_POP3_OR_IMAP_OR_GMAIL_TRUE WITH_POP3_OR_IMAP_OR_GMAIL_FALSE WITH_SSL_TRUE WITH_SSL_FALSE WITH_SASL_TRUE WITH_SASL_FALSE WITH_SYLPHEED_TRUE WITH_SYLPHEED_FALSE WITH_GMAIL_TRUE WITH_GMAIL_FALSE WITH_MIME_TRUE WITH_MIME_FALSE WITH_REGRESSION_TESTS_TRUE WITH_REGRESSION_TESTS_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WARN_CFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GETTEXT_PACKAGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGMERGE PKG_CONFIG GTK_CFLAGS GTK_LIBS GNOME_CFLAGS GNOME_LIBS GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GCONFTOOL ORBIT_IDL LIBBONOBO_IDL BONOBO_ACTIVATION_IDL GOB2 GLIB_GENMARSHAL GMIME_CFLAGS GMIME_LIBS OPENSSL_CFLAGS OPENSSL_LIBS SASL_CFLAGS SASL_LIBS SOUP_CFLAGS SOUP_LIBS ICU_CONFIG ICU_CFLAGS ICU_LIBS WITH_MBOX_TRUE WITH_MBOX_FALSE WITH_MH_TRUE WITH_MH_FALSE WITH_MAILDIR_TRUE WITH_MAILDIR_FALSE WITH_POP3_TRUE WITH_POP3_FALSE WITH_IMAP_TRUE WITH_IMAP_FALSE WITH_POP3_OR_IMAP_TRUE WITH_POP3_OR_IMAP_FALSE WITH_POP3_OR_IMAP_OR_GMAIL_TRUE WITH_POP3_OR_IMAP_OR_GMAIL_FALSE WITH_SSL_TRUE WITH_SSL_FALSE WITH_SASL_TRUE WITH_SASL_FALSE WITH_SYLPHEED_TRUE WITH_SYLPHEED_FALSE WITH_GMAIL_TRUE WITH_GMAIL_FALSE WITH_GMAIL_TIMESTAMPS_TRUE WITH_GMAIL_TIMESTAMPS_FALSE WITH_MIME_TRUE WITH_MIME_FALSE WITH_REGRESSION_TESTS_TRUE WITH_REGRESSION_TESTS_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mail-notification 1.0 to adapt to many kinds of systems.
+\`configure' configures mail-notification 1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -842,7 +842,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mail-notification 1.0:";;
+     short | recursive ) echo "Configuration of mail-notification 1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -858,8 +858,9 @@ Optional Features:
   --disable-sasl          disable SASL authentication support
   --disable-sylpheed      disable Sylpheed support
   --disable-gmail         disable Gmail support
+  --disable-gmail-timestamps
+                          disable Gmail timestamps support
   --disable-ipv6          disable IPv6 support
-  --disable-mime          disable MIME support
   --enable-compile-warnings=no|yes|error
                           enable compiler warnings [no]
   --enable-regression-tests
@@ -986,7 +987,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-mail-notification configure 1.0
+mail-notification configure 1.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1000,7 +1001,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mail-notification $as_me 1.0, which was
+It was created by mail-notification $as_me 1.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1450,6 +1451,18 @@ esac
 else
   enable_gmail=yes
 fi;
+# Check whether --enable-gmail-timestamps or --disable-gmail-timestamps was given.
+if test "${enable_gmail_timestamps+set}" = set; then
+  enableval="$enable_gmail_timestamps"
+  case "$enableval" in
+	yes|no) enable_gmail_timestamps=$enableval ;;
+	*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-gmail-timestamps" >&5
+echo "$as_me: error: bad value $enableval for --enable-gmail-timestamps" >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
+else
+  enable_gmail_timestamps=yes
+fi;
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
 if test "${enable_ipv6+set}" = set; then
   enableval="$enable_ipv6"
@@ -1462,18 +1475,6 @@ esac
 else
   enable_ipv6=yes
 fi;
-# Check whether --enable-mime or --disable-mime was given.
-if test "${enable_mime+set}" = set; then
-  enableval="$enable_mime"
-  case "$enableval" in
-	yes|no) enable_mime=$enableval ;;
-	*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-mime" >&5
-echo "$as_me: error: bad value $enableval for --enable-mime" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  enable_mime=yes
-fi;
 
 # Check whether --enable-compile-warnings or --disable-compile-warnings was given.
 if test "${enable_compile_warnings+set}" = set; then
@@ -1491,8 +1492,23 @@ fi;
 if test $enable_compile_warnings = no; then
 	WARN_CFLAGS=
 else
-	# some flags are specific to GCC
-	WARN_CFLAGS="-Wall -Wcast-align -Wredundant-decls -Wnested-externs -Winline"
+	# most flags are specific to GCC
+	WARN_CFLAGS="-Wall \
+-Wformat-y2k \
+-Wformat-security \
+-Wno-unused-parameter \
+-Wfloat-equal \
+-Wdeclaration-after-statement \
+-Wendif-labels \
+-Wpointer-arith \
+-Wcast-align \
+-Waggregate-return \
+-Wmissing-noreturn \
+-Wmissing-format-attribute \
+-Wpacked \
+-Wredundant-decls \
+-Wnested-externs \
+-Winline"
 	test $enable_compile_warnings = error && WARN_CFLAGS="$WARN_CFLAGS -Werror"
 fi
 
@@ -1819,7 +1835,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mail-notification'
- VERSION='1.0'
+ VERSION='1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6661,175 +6677,6 @@ echo "$as_me: error: ANSI C headers not present" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-# timegm() is non-standard, define HAVE_TIMEGM if it is present
-
-for ac_func in timegm
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-# see if "struct tm" is defined in sys/time.h
-echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
-if test "${ac_cv_struct_tm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <time.h>
-
-int
-main ()
-{
-struct tm *tp; tp->tm_sec;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_struct_tm=time.h
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_struct_tm=sys/time.h
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6
-if test $ac_cv_struct_tm = sys/time.h; then
-
-cat >>confdefs.h <<\_ACEOF
-#define TM_IN_SYS_TIME 1
-_ACEOF
-
-fi
-
-
 ### mandatory libraries and programs
 
 # Check whether --enable-gtktest or --disable-gtktest was given.
@@ -7350,7 +7197,7 @@ BONOBO_ACTIVATION_IDL="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
 
 ### optional libraries
 
-# not needed by end-users, as files generated by GOB are distributed
+# not needed by end-users, as generated files are distributed
 # Extract the first word of "gob2", so it can be a program name with args.
 set dummy gob2; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -7390,6 +7237,188 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+# Extract the first word of "glib-genmarshal", so it can be a program name with args.
+set dummy glib-genmarshal; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $GLIB_GENMARSHAL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
+
+if test -n "$GLIB_GENMARSHAL"; then
+  echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5
+echo "${ECHO_T}$GLIB_GENMARSHAL" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+enable_mime=no
+if test $enable_mbox = yes ||
+   test $enable_mh = yes ||
+   test $enable_maildir = yes ||
+   test $enable_pop3 = yes ||
+   test $enable_imap = yes ||
+   test $enable_sylpheed = yes; then
+
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for gmime-2.0 >= 2.1.0" >&5
+echo $ECHO_N "checking for gmime-2.0 >= 2.1.0... $ECHO_C" >&6
+
+        if $PKG_CONFIG --exists "gmime-2.0 >= 2.1.0" ; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+            succeeded=yes
+
+            echo "$as_me:$LINENO: checking GMIME_CFLAGS" >&5
+echo $ECHO_N "checking GMIME_CFLAGS... $ECHO_C" >&6
+            GMIME_CFLAGS=`$PKG_CONFIG --cflags "gmime-2.0 >= 2.1.0"`
+            echo "$as_me:$LINENO: result: $GMIME_CFLAGS" >&5
+echo "${ECHO_T}$GMIME_CFLAGS" >&6
+
+            echo "$as_me:$LINENO: checking GMIME_LIBS" >&5
+echo $ECHO_N "checking GMIME_LIBS... $ECHO_C" >&6
+            GMIME_LIBS=`$PKG_CONFIG --libs "gmime-2.0 >= 2.1.0"`
+            echo "$as_me:$LINENO: result: $GMIME_LIBS" >&5
+echo "${ECHO_T}$GMIME_LIBS" >&6
+        else
+            GMIME_CFLAGS=""
+            GMIME_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            GMIME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmime-2.0 >= 2.1.0"`
+
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     enable_mime=yes
+  else
+     :
+  fi
+
+	if test $enable_mime = no; then
+		if test $enable_mbox = yes; then
+			{ echo "$as_me:$LINENO: GMime not found: forcing --disable-mbox" >&5
+echo "$as_me: GMime not found: forcing --disable-mbox" >&6;}
+enable_mbox=no
+disable_mbox_reason="(GMime not found)"
+		fi
+		if test $enable_mh = yes; then
+			{ echo "$as_me:$LINENO: GMime not found: forcing --disable-mh" >&5
+echo "$as_me: GMime not found: forcing --disable-mh" >&6;}
+enable_mh=no
+disable_mh_reason="(GMime not found)"
+		fi
+		if test $enable_maildir = yes; then
+			{ echo "$as_me:$LINENO: GMime not found: forcing --disable-maildir" >&5
+echo "$as_me: GMime not found: forcing --disable-maildir" >&6;}
+enable_maildir=no
+disable_maildir_reason="(GMime not found)"
+		fi
+		if test $enable_pop3 = yes; then
+			{ echo "$as_me:$LINENO: GMime not found: forcing --disable-pop3" >&5
+echo "$as_me: GMime not found: forcing --disable-pop3" >&6;}
+enable_pop3=no
+disable_pop3_reason="(GMime not found)"
+		fi
+		if test $enable_imap = yes; then
+			{ echo "$as_me:$LINENO: GMime not found: forcing --disable-imap" >&5
+echo "$as_me: GMime not found: forcing --disable-imap" >&6;}
+enable_imap=no
+disable_imap_reason="(GMime not found)"
+		fi
+		if test $enable_sylpheed = yes; then
+			{ echo "$as_me:$LINENO: GMime not found: forcing --disable-sylpheed" >&5
+echo "$as_me: GMime not found: forcing --disable-sylpheed" >&6;}
+enable_sylpheed=no
+disable_sylpheed_reason="(GMime not found)"
+		fi
+	fi
+fi
 
 if test $enable_pop3 = no && test $enable_imap = no; then
 	if test $enable_ssl = yes; then
@@ -7675,35 +7704,18 @@ disable_gmail_reason="(libsoup not found)"
   fi
 
 fi
-
-if test $enable_mime = yes &&
-   test $enable_mbox = no &&
-   test $enable_mh = no &&
-   test $enable_maildir = no &&
-   test $enable_pop3 = no &&
-   test $enable_imap = no &&
-   test $enable_sylpheed = no; then
-	{ echo "$as_me:$LINENO: mbox, MH, Maildir, POP3, IMAP and Sylpheed support disabled: forcing --disable-mime" >&5
-echo "$as_me: mbox, MH, Maildir, POP3, IMAP and Sylpheed support disabled: forcing --disable-mime" >&6;}
-enable_mime=no
-disable_mime_reason="(mbox, MH, Maildir, POP3, IMAP and Sylpheed support disabled)"
-fi
-
-if test $enable_mime = yes; then
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+if test $enable_gmail_timestamps = yes; then
+	if test $enable_gmail = yes; then
+		# Extract the first word of "icu-config", so it can be a program name with args.
+set dummy icu-config; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_ICU_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  case $PKG_CONFIG in
+  case $ICU_CONFIG in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ac_cv_path_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7713,82 +7725,123 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_ICU_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  test -z "$ac_cv_path_ICU_CONFIG" && ac_cv_path_ICU_CONFIG="no"
   ;;
 esac
 fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ICU_CONFIG=$ac_cv_path_ICU_CONFIG
 
-if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+if test -n "$ICU_CONFIG"; then
+  echo "$as_me:$LINENO: result: $ICU_CONFIG" >&5
+echo "${ECHO_T}$ICU_CONFIG" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-  fi
 
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for gmime-2.0 >= 2.1.0" >&5
-echo $ECHO_N "checking for gmime-2.0 >= 2.1.0... $ECHO_C" >&6
+if test "x$ICU_CONFIG" = xno; then
+	ICU_CFLAGS=""
+	ICU_LIBS=""
 
-        if $PKG_CONFIG --exists "gmime-2.0 >= 2.1.0" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-            succeeded=yes
+	{ echo "$as_me:$LINENO: ICU not found: forcing --disable-gmail-timestamps" >&5
+echo "$as_me: ICU not found: forcing --disable-gmail-timestamps" >&6;}
+enable_gmail_timestamps=no
+disable_gmail_timestamps_reason="(ICU not found)"
+else
+	ICU_CFLAGS=`$ICU_CONFIG --cppflags`
+	ICU_LIBS=`$ICU_CONFIG --ldflags`
 
-            echo "$as_me:$LINENO: checking GMIME_CFLAGS" >&5
-echo $ECHO_N "checking GMIME_CFLAGS... $ECHO_C" >&6
-            GMIME_CFLAGS=`$PKG_CONFIG --cflags "gmime-2.0 >= 2.1.0"`
-            echo "$as_me:$LINENO: result: $GMIME_CFLAGS" >&5
-echo "${ECHO_T}$GMIME_CFLAGS" >&6
+	# the version checking API we need has been introduced in 2.4
+	icu_min_version=2.6
 
-            echo "$as_me:$LINENO: checking GMIME_LIBS" >&5
-echo $ECHO_N "checking GMIME_LIBS... $ECHO_C" >&6
-            GMIME_LIBS=`$PKG_CONFIG --libs "gmime-2.0 >= 2.1.0"`
-            echo "$as_me:$LINENO: result: $GMIME_LIBS" >&5
-echo "${ECHO_T}$GMIME_LIBS" >&6
-        else
-            GMIME_CFLAGS=""
-            GMIME_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GMIME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmime-2.0 >= 2.1.0"`
+	ac_save_CFLAGS="$CFLAGS"
+	ac_save_LIBS="$LIBS"
+	CFLAGS="$CFLAGS $ICU_CFLAGS"
+	LIBS="$LIBS $ICU_LIBS"
 
-        fi
+	echo "$as_me:$LINENO: checking for ICU - version >= $icu_min_version" >&5
+echo $ECHO_N "checking for ICU - version >= $icu_min_version... $ECHO_C" >&6
 
+	if test "$cross_compiling" = yes; then
+  found=yes
+else
+  cat >conftest.$ac_ext <<_ACEOF
 
+#include <string.h>
+#include <unicode/uversion.h>
 
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
+int main() {
+  UVersionInfo min_version;
+  UVersionInfo version;
 
-  if test $succeeded = yes; then
-     :
-  else
-     { echo "$as_me:$LINENO: GMime not found: forcing --disable-mime" >&5
-echo "$as_me: GMime not found: forcing --disable-mime" >&6;}
-enable_mime=no
-disable_mime_reason="(GMime not found)"
-  fi
+  u_versionFromString(min_version, "$icu_min_version");
+  u_getVersion(version);
+
+  if (memcmp(min_version, version, U_MAX_VERSION_LENGTH) > 0)
+    exit(1); /* version too old */
+
+  exit(0);
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  found=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+found=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+	echo "$as_me:$LINENO: result: $found" >&5
+echo "${ECHO_T}$found" >&6
+
+	CFLAGS="$ac_save_CFLAGS"
+	LIBS="$ac_save_LIBS"
+
+	if test $found = yes; then
+		:
+	else
+		ICU_CFLAGS=""
+		ICU_LIBS=""
 
+		{ echo "$as_me:$LINENO: ICU not found: forcing --disable-gmail-timestamps" >&5
+echo "$as_me: ICU not found: forcing --disable-gmail-timestamps" >&6;}
+enable_gmail_timestamps=no
+disable_gmail_timestamps_reason="(ICU not found)"
+	fi
+fi
+
+
+
+	else
+		{ echo "$as_me:$LINENO: Gmail support disabled: forcing --disable-gmail-timestamps" >&5
+echo "$as_me: Gmail support disabled: forcing --disable-gmail-timestamps" >&6;}
+enable_gmail_timestamps=no
+disable_gmail_timestamps_reason="(Gmail support disabled)"
+	fi
 fi
 
 ### Automake conditionals
@@ -7905,6 +7958,16 @@ fi
 
 
 
+if test $enable_gmail_timestamps = yes; then
+  WITH_GMAIL_TIMESTAMPS_TRUE=
+  WITH_GMAIL_TIMESTAMPS_FALSE='#'
+else
+  WITH_GMAIL_TIMESTAMPS_TRUE='#'
+  WITH_GMAIL_TIMESTAMPS_FALSE=
+fi
+
+
+
 if test $enable_mime = yes; then
   WITH_MIME_TRUE=
   WITH_MIME_FALSE='#'
@@ -7989,6 +8052,13 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
+if test $enable_gmail_timestamps = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_GMAIL_TIMESTAMPS 1
+_ACEOF
+
+fi
 if test $enable_ipv6 = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -8219,6 +8289,13 @@ echo "$as_me: error: conditional \"WITH_GMAIL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${WITH_GMAIL_TIMESTAMPS_TRUE}" && test -z "${WITH_GMAIL_TIMESTAMPS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"WITH_GMAIL_TIMESTAMPS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_GMAIL_TIMESTAMPS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${WITH_MIME_TRUE}" && test -z "${WITH_MIME_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"WITH_MIME\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -8504,7 +8581,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by mail-notification $as_me 1.0, which was
+This file was extended by mail-notification $as_me 1.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8567,7 +8644,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-mail-notification config.status 1.0
+mail-notification config.status 1.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -8877,14 +8954,18 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t
 s,@LIBBONOBO_IDL@,$LIBBONOBO_IDL,;t t
 s,@BONOBO_ACTIVATION_IDL@,$BONOBO_ACTIVATION_IDL,;t t
 s,@GOB2@,$GOB2,;t t
+s,@GLIB_GENMARSHAL@,$GLIB_GENMARSHAL,;t t
+s,@GMIME_CFLAGS@,$GMIME_CFLAGS,;t t
+s,@GMIME_LIBS@,$GMIME_LIBS,;t t
 s,@OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
 s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
 s,@SASL_CFLAGS@,$SASL_CFLAGS,;t t
 s,@SASL_LIBS@,$SASL_LIBS,;t t
 s,@SOUP_CFLAGS@,$SOUP_CFLAGS,;t t
 s,@SOUP_LIBS@,$SOUP_LIBS,;t t
-s,@GMIME_CFLAGS@,$GMIME_CFLAGS,;t t
-s,@GMIME_LIBS@,$GMIME_LIBS,;t t
+s,@ICU_CONFIG@,$ICU_CONFIG,;t t
+s,@ICU_CFLAGS@,$ICU_CFLAGS,;t t
+s,@ICU_LIBS@,$ICU_LIBS,;t t
 s,@WITH_MBOX_TRUE@,$WITH_MBOX_TRUE,;t t
 s,@WITH_MBOX_FALSE@,$WITH_MBOX_FALSE,;t t
 s,@WITH_MH_TRUE@,$WITH_MH_TRUE,;t t
@@ -8907,6 +8988,8 @@ s,@WITH_SYLPHEED_TRUE@,$WITH_SYLPHEED_TRUE,;t t
 s,@WITH_SYLPHEED_FALSE@,$WITH_SYLPHEED_FALSE,;t t
 s,@WITH_GMAIL_TRUE@,$WITH_GMAIL_TRUE,;t t
 s,@WITH_GMAIL_FALSE@,$WITH_GMAIL_FALSE,;t t
+s,@WITH_GMAIL_TIMESTAMPS_TRUE@,$WITH_GMAIL_TIMESTAMPS_TRUE,;t t
+s,@WITH_GMAIL_TIMESTAMPS_FALSE@,$WITH_GMAIL_TIMESTAMPS_FALSE,;t t
 s,@WITH_MIME_TRUE@,$WITH_MIME_TRUE,;t t
 s,@WITH_MIME_FALSE@,$WITH_MIME_FALSE,;t t
 s,@WITH_REGRESSION_TESTS_TRUE@,$WITH_REGRESSION_TESTS_TRUE,;t t
@@ -9680,27 +9763,27 @@ $PACKAGE $VERSION is ready to be built.
 The following settings will be used:
 
 Installation prefixes
-  --prefix           $prefix
-  --exec-prefix      $exec_prefix
+  --prefix                     $prefix
+  --exec-prefix                $exec_prefix
 
 Installation directories
-  --bindir           $bindir
-  --datadir          $datadir
-  --sysconfdir       $sysconfdir
-  --libdir           $libdir
+  --bindir                     $bindir
+  --datadir                    $datadir
+  --sysconfdir                 $sysconfdir
+  --libdir                     $libdir
 
 Features
-  --enable-mbox      $enable_mbox $disable_mbox_reason
-  --enable-mh        $enable_mh $disable_mh_reason
-  --enable-maildir   $enable_maildir $disable_maildir_reason
-  --enable-pop3      $enable_pop3 $disable_pop3_reason
-  --enable-imap      $enable_imap $disable_imap_reason
-  --enable-ssl       $enable_ssl $disable_ssl_reason
-  --enable-sasl      $enable_sasl $disable_sasl_reason
-  --enable-sylpheed  $enable_sylpheed $disable_sylpheed_reason
-  --enable-gmail     $enable_gmail $disable_gmail_reason
-  --enable-ipv6      $enable_ipv6 $disable_ipv6_reason
-  --enable-mime      $enable_mime $disable_mime_reason
+  --enable-mbox                $enable_mbox $disable_mbox_reason
+  --enable-mh                  $enable_mh $disable_mh_reason
+  --enable-maildir             $enable_maildir $disable_maildir_reason
+  --enable-pop3                $enable_pop3 $disable_pop3_reason
+  --enable-imap                $enable_imap $disable_imap_reason
+  --enable-ssl                 $enable_ssl $disable_ssl_reason
+  --enable-sasl                $enable_sasl $disable_sasl_reason
+  --enable-sylpheed            $enable_sylpheed $disable_sylpheed_reason
+  --enable-gmail               $enable_gmail $disable_gmail_reason
+  --enable-gmail-timestamps    $enable_gmail_timestamps $disable_gmail_timestamps_reason
+  --enable-ipv6                $enable_ipv6 $disable_ipv6_reason
 
 Type "make" to build $PACKAGE $VERSION.
 EOF
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(mail-notification, 1.0, jylefort@brutele.be)
+AC_INIT(mail-notification, 1.1, jylefort@brutele.be)
 AC_CONFIG_SRCDIR(src/mn-main.c)
 
 AC_PREREQ(2.59)
@@ -14,8 +14,8 @@ MN_ARG_ENABLE(ssl, [disable SSL/TLS support])
 MN_ARG_ENABLE(sasl, [disable SASL authentication support])
 MN_ARG_ENABLE(sylpheed, [disable Sylpheed support])
 MN_ARG_ENABLE(gmail, [disable Gmail support])
+MN_ARG_ENABLE(gmail-timestamps, [disable Gmail timestamps support])
 MN_ARG_ENABLE(ipv6, [disable IPv6 support])
-MN_ARG_ENABLE(mime, [disable MIME support])
 
 MN_ARG_COMPILE_WARNINGS
 MN_ARG_ENABLE(regression-tests, [build and run regression tests], no)
@@ -48,12 +48,6 @@ if test $ac_cv_header_stdc != yes; then
 	AC_MSG_ERROR([ANSI C headers not present])
 fi
 
-# timegm() is non-standard, define HAVE_TIMEGM if it is present
-AC_CHECK_FUNCS(timegm)
-
-# see if "struct tm" is defined in sys/time.h
-AC_STRUCT_TM
-
 ### mandatory libraries and programs
 
 AM_PATH_GTK_2_0(2.4.0,, [AC_MSG_ERROR([unable to find the GTK+ library])])
@@ -77,9 +71,40 @@ AC_SUBST(BONOBO_ACTIVATION_IDL)
 
 ### optional libraries
 
-# not needed by end-users, as files generated by GOB are distributed
+# not needed by end-users, as generated files are distributed
 AC_PATH_PROG(GOB2, gob2)
-
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+
+MN_FEATURE_VAR_NAME(mime)=no
+if MN_FEATURE_ENABLED(mbox) ||
+   MN_FEATURE_ENABLED(mh) ||
+   MN_FEATURE_ENABLED(maildir) ||
+   MN_FEATURE_ENABLED(pop3) ||
+   MN_FEATURE_ENABLED(imap) ||
+   MN_FEATURE_ENABLED(sylpheed); then
+	PKG_CHECK_MODULES(GMIME, [gmime-2.0 >= 2.1.0], [MN_FEATURE_VAR_NAME(mime)=yes], [:])
+	if MN_FEATURE_DISABLED(mime); then
+		if MN_FEATURE_ENABLED(mbox); then
+			MN_FEATURE_DISABLE(mbox, [GMime not found])
+		fi
+		if MN_FEATURE_ENABLED(mh); then
+			MN_FEATURE_DISABLE(mh, [GMime not found])
+		fi
+		if MN_FEATURE_ENABLED(maildir); then
+			MN_FEATURE_DISABLE(maildir, [GMime not found])
+		fi
+		if MN_FEATURE_ENABLED(pop3); then
+			MN_FEATURE_DISABLE(pop3, [GMime not found])
+		fi
+		if MN_FEATURE_ENABLED(imap); then
+			MN_FEATURE_DISABLE(imap, [GMime not found])
+		fi
+		if MN_FEATURE_ENABLED(sylpheed); then
+			MN_FEATURE_DISABLE(sylpheed, [GMime not found])
+		fi
+	fi
+fi
+	
 if MN_FEATURE_DISABLED(pop3) && MN_FEATURE_DISABLED(imap); then
 	if MN_FEATURE_ENABLED(ssl); then
 		MN_FEATURE_DISABLE(ssl, [POP3 and IMAP support disabled])
@@ -102,19 +127,12 @@ fi
 if MN_FEATURE_ENABLED(gmail); then
 	PKG_CHECK_MODULES(SOUP, libsoup-2.2,, [MN_FEATURE_DISABLE(gmail, [libsoup not found])])
 fi	
-
-if MN_FEATURE_ENABLED(mime) &&
-   MN_FEATURE_DISABLED(mbox) &&
-   MN_FEATURE_DISABLED(mh) &&
-   MN_FEATURE_DISABLED(maildir) &&
-   MN_FEATURE_DISABLED(pop3) &&
-   MN_FEATURE_DISABLED(imap) &&
-   MN_FEATURE_DISABLED(sylpheed); then
-	MN_FEATURE_DISABLE(mime, [mbox, MH, Maildir, POP3, IMAP and Sylpheed support disabled])
-fi
-
-if MN_FEATURE_ENABLED(mime); then
-	PKG_CHECK_MODULES(GMIME, [gmime-2.0 >= 2.1.0],, [MN_FEATURE_DISABLE(mime, [GMime not found])])
+if MN_FEATURE_ENABLED(gmail-timestamps); then
+	if MN_FEATURE_ENABLED(gmail); then
+		AM_PATH_ICU(2.6,, [MN_FEATURE_DISABLE(gmail-timestamps, [ICU not found])])
+	else
+		MN_FEATURE_DISABLE(gmail-timestamps, [Gmail support disabled])
+	fi
 fi
 
 ### Automake conditionals
@@ -130,12 +148,13 @@ AM_CONDITIONAL(WITH_SSL, [MN_FEATURE_ENABLED(ssl)])
 AM_CONDITIONAL(WITH_SASL, [MN_FEATURE_ENABLED(sasl)])
 AM_CONDITIONAL(WITH_SYLPHEED, [MN_FEATURE_ENABLED(sylpheed)])
 AM_CONDITIONAL(WITH_GMAIL, [MN_FEATURE_ENABLED(gmail)])
+AM_CONDITIONAL(WITH_GMAIL_TIMESTAMPS, [MN_FEATURE_ENABLED(gmail-timestamps)])
 AM_CONDITIONAL(WITH_MIME, [MN_FEATURE_ENABLED(mime)])
 AM_CONDITIONAL(WITH_REGRESSION_TESTS, [MN_FEATURE_ENABLED(regression-tests)])
 
 ### config.h definitions
 
-MN_FEATURES_DEFINE([mbox, mh, maildir, pop3, imap, ssl, sasl, sylpheed, gmail, ipv6, mime])
+MN_FEATURES_DEFINE([mbox, mh, maildir, pop3, imap, ssl, sasl, sylpheed, gmail, gmail-timestamps, ipv6, mime])
 
 ### output
 
@@ -163,6 +182,6 @@ MN_REPORT_ARGS([prefix, exec-prefix])
 Installation directories
 MN_REPORT_ARGS([bindir, datadir, sysconfdir, libdir])
 Features
-MN_REPORT_FEATURES([mbox, mh, maildir, pop3, imap, ssl, sasl, sylpheed, gmail, ipv6, mime])
+MN_REPORT_FEATURES([mbox, mh, maildir, pop3, imap, ssl, sasl, sylpheed, gmail, gmail-timestamps, ipv6])
 Type "make" to build $PACKAGE $VERSION.
 EOF
diff --git a/data/Makefile.in b/data/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37,9 +37,9 @@ POST_UNINSTALL = :
 subdir = data
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
-	$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/icu.m4 \
+	$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -95,6 +95,7 @@ GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMIME_CFLAGS = @GMIME_CFLAGS@
 GMIME_LIBS = @GMIME_LIBS@
 GMOFILES = @GMOFILES@
@@ -105,6 +106,9 @@ GOB2 = @GOB2@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 ICONV = @ICONV@
+ICU_CFLAGS = @ICU_CFLAGS@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_LIBS = @ICU_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -171,6 +175,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
+WITH_GMAIL_TIMESTAMPS_FALSE = @WITH_GMAIL_TIMESTAMPS_FALSE@
+WITH_GMAIL_TIMESTAMPS_TRUE = @WITH_GMAIL_TIMESTAMPS_TRUE@
 WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
 WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
 WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
diff --git a/data/mail-notification-properties.desktop.in b/data/mail-notification-properties.desktop.in
@@ -8,3 +8,4 @@ Categories=GNOME;Application;Settings;
 Exec=mail-notification --display-properties
 Terminal=false
 StartupNotify=true
+X-GNOME-DocPath=mail-notification/mail-notification.xml
+\ No newline at end of file
diff --git a/data/mail-notification.desktop.in b/data/mail-notification.desktop.in
@@ -5,5 +5,7 @@ Icon=mail-notification.png
 _Comment=Get notified when new mail arrives
 Type=Application
 Categories=GNOME;Application;Network;
-Exec=mail-notification
+Exec=mail-notification --display-main-window
 Terminal=false
+StartupNotify=true
+X-GNOME-DocPath=mail-notification/mail-notification.xml
+\ No newline at end of file
diff --git a/data/mail-notification.schemas.in b/data/mail-notification.schemas.in
@@ -120,38 +120,93 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/apps/mail-notification/ui/summary-dialog/height</key>
-      <applyto>/apps/mail-notification/ui/summary-dialog/height</applyto>
+      <key>/schemas/apps/mail-notification/ui/immediate-notification-error-dialog/do-not-show</key>
+      <applyto>/apps/mail-notification/ui/immediate-notification-error-dialog/do-not-show</applyto>
+      <owner>mail-notification</owner>
+      <type>bool</type>
+      <default>0</default>
+      <locale name="C">
+        <short>Do not show the immediate notification error dialog</short>
+	<long>Whether to prevent the immediate notification error dialog from being displayed or not.</long>
+      </locale>
+    </schema> 
+    <schema>
+      <key>/schemas/apps/mail-notification/ui/main-window/dimensions/height</key>
+      <applyto>/apps/mail-notification/ui/main-window/dimensions/height</applyto>
       <owner>mail-notification</owner>
       <type>int</type>
-      <default>-1</default>
+      <default>300</default>
       <locale name="C">
-        <short>Height of mail summary dialog</short>
-        <long>The height of the mail summary dialog in pixels.</long>
+        <short>Height of main window</short>
+        <long>The height of the main window in pixels.</long>
       </locale>
     </schema>
     <schema>
-      <key>/schemas/apps/mail-notification/ui/summary-dialog/width</key>
-      <applyto>/apps/mail-notification/ui/summary-dialog/width</applyto>
+      <key>/schemas/apps/mail-notification/ui/main-window/dimensions/width</key>
+      <applyto>/apps/mail-notification/ui/main-window/dimensions/width</applyto>
       <owner>mail-notification</owner>
       <type>int</type>
-      <default>-1</default>
+      <default>400</default>
       <locale name="C">
-        <short>Width of mail summary dialog</short>
-        <long>The width of the mail summary dialog in pixels.</long>
+        <short>Width of main window</short>
+        <long>The width of the main window in pixels.</long>
       </locale>
     </schema>
     <schema>
-      <key>/schemas/apps/mail-notification/ui/immediate-notification-error-dialog/do-not-show</key>
-      <applyto>/apps/mail-notification/ui/immediate-notification-error-dialog/do-not-show</applyto>
+      <key>/schemas/apps/mail-notification/ui/main-window/view-toolbars</key>
+      <applyto>/apps/mail-notification/ui/main-window/view-toolbars</applyto>
       <owner>mail-notification</owner>
       <type>bool</type>
-      <default>0</default>
+      <default>1</default>
       <locale name="C">
-        <short>Do not show the immediate notification error dialog</short>
-	<long>Whether to prevent the immediate notification error dialog from being displayed or not.</long>
+	<short>View toolbars</short>
+	<long>Whether the toolbars should be visible or not.</long>
       </locale>
-    </schema> 
+    </schema>
+    <schema>
+      <key>/schemas/apps/mail-notification/ui/main-window/view-statusbar</key>
+      <applyto>/apps/mail-notification/ui/main-window/view-statusbar</applyto>
+      <owner>mail-notification</owner>
+      <type>bool</type>
+      <default>1</default>
+      <locale name="C">
+	<short>View statusbar</short>
+	<long>Whether the statusbar should be visible or not.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/apps/mail-notification/ui/main-window/toolbars-style</key>
+      <applyto>/apps/mail-notification/ui/main-window/toolbars-style</applyto>
+      <owner>mail-notification</owner>
+      <type>string</type>
+      <default>desktop-default</default>
+      <locale name="C">
+	<short>Toolbars style</short>
+	<long>The style of the toolbars. Must be "desktop-default", "icons", "text", "both" or "both-horiz".</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/apps/mail-notification/ui/main-window/edit-toolbars-dialog/height</key>
+      <applyto>/apps/mail-notification/ui/main-window/edit-toolbars-dialog/height</applyto>
+      <owner>mail-notification</owner>
+      <type>int</type>
+      <default>-1</default>
+      <locale name="C">
+        <short>Height of edit toolbars dialog</short>
+        <long>The height of the edit toolbars dialog in pixels.</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/apps/mail-notification/ui/main-window/edit-toolbars-dialog/width</key>
+      <applyto>/apps/mail-notification/ui/main-window/edit-toolbars-dialog/width</applyto>
+      <owner>mail-notification</owner>
+      <type>int</type>
+      <default>-1</default>
+      <locale name="C">
+        <short>Width of edit toolbars dialog</short>
+        <long>The width of the edit toolbars dialog in pixels.</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/apps/mail-notification/already-run</key>
       <applyto>/apps/mail-notification/already-run</applyto>
@@ -285,16 +340,16 @@
       </locale>
     </schema> 
     <schema>
-      <key>/schemas/apps/mail-notification/mail-summary-popup/fonts/title/enabled</key>
-      <applyto>/apps/mail-notification/mail-summary-popup/fonts/title/enabled</applyto>
+      <key>/schemas/apps/mail-notification/mail-summary-popup/fonts/aspect-source</key>
+      <applyto>/apps/mail-notification/mail-summary-popup/fonts/aspect-source</applyto>
       <owner>mail-notification</owner>
-      <type>bool</type>
-      <default>0</default>
+      <type>string</type>
+      <default>theme</default>
       <locale name="C">
-        <short>Use a custom font for the title of the mail summary popup</short>
-	<long>Whether to use a custom font for the title of the mail summary popup or not.</long>
+        <short>Mail summary popup fonts aspect source</short>
+	<long>The aspect source of the mail summary popup fonts. Must be "theme" or "custom".</long>
       </locale>
-    </schema> 
+    </schema>
     <schema>
       <key>/schemas/apps/mail-notification/mail-summary-popup/fonts/title/font</key>
       <applyto>/apps/mail-notification/mail-summary-popup/fonts/title/font</applyto>
@@ -307,17 +362,6 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/apps/mail-notification/mail-summary-popup/fonts/contents/enabled</key>
-      <applyto>/apps/mail-notification/mail-summary-popup/fonts/contents/enabled</applyto>
-      <owner>mail-notification</owner>
-      <type>bool</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Use a custom font for the contents of the mail summary popup</short>
-	<long>Whether to use a custom font for the contents of the mail summary popup or not.</long>
-      </locale>
-    </schema> 
-    <schema>
       <key>/schemas/apps/mail-notification/mail-summary-popup/fonts/contents/font</key>
       <applyto>/apps/mail-notification/mail-summary-popup/fonts/contents/font</applyto>
       <owner>mail-notification</owner>
@@ -329,14 +373,14 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/apps/mail-notification/double-click-action</key>
-      <applyto>/apps/mail-notification/double-click-action</applyto>
+      <key>/schemas/apps/mail-notification/double-click-action-2</key>
+      <applyto>/apps/mail-notification/double-click-action-2</applyto>
       <owner>mail-notification</owner>
       <type>string</type>
-      <default>display-mail-summary</default>
+      <default>display-main-window</default>
       <locale name="C">
         <short>Double-click action</short>
-	<long>The action to perform when the icon is double-clicked. Must be "display-mail-summary" or "launch-mail-reader".</long>
+	<long>The action to perform when the icon is double-clicked. Must be "display-main-window", "launch-mail-reader" or "update-mail-status".</long>
       </locale>
     </schema>
     <schema>
diff --git a/help/C/Makefile.in b/help/C/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -99,9 +99,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/help/omf.make $(top_srcdir)/help/xmldocs.make
 subdir = help/C
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
-	$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/icu.m4 \
+	$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -141,6 +141,7 @@ GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMIME_CFLAGS = @GMIME_CFLAGS@
 GMIME_LIBS = @GMIME_LIBS@
 GMOFILES = @GMOFILES@
@@ -151,6 +152,9 @@ GOB2 = @GOB2@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 ICONV = @ICONV@
+ICU_CFLAGS = @ICU_CFLAGS@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_LIBS = @ICU_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -217,6 +221,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
+WITH_GMAIL_TIMESTAMPS_FALSE = @WITH_GMAIL_TIMESTAMPS_FALSE@
+WITH_GMAIL_TIMESTAMPS_TRUE = @WITH_GMAIL_TIMESTAMPS_TRUE@
 WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
 WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
 WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
diff --git a/help/C/mail-notification-C.omf b/help/C/mail-notification-C.omf
@@ -12,9 +12,9 @@
       Mail Notification Manual
     </title>
     <date>
-      2004-11-25
+      2005-03-06
     </date>
-    <version identifier="2.10" date="2004-11-25" description="Eleventh release"/>
+    <version identifier="2.11" date="2005-03-06" description="Twelfth release"/>
     <subject category="GNOME|Internet"/>
     <description>
       Mail Notification Manual
diff --git a/help/C/mail-notification.xml b/help/C/mail-notification.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
   <!ENTITY app "<application>Mail Notification</application>">
-  <!ENTITY appversion "1.0">
-  <!ENTITY manrevision "2.10">
-  <!ENTITY date "Thursday, November 25, 2004">
+  <!ENTITY appversion "1.1">
+  <!ENTITY manrevision "2.11">
+  <!ENTITY date "Sunday, March 6, 2005">
 
   <!ENTITY project "The Mail Notification Project">
 
@@ -26,10 +26,10 @@
   <!ENTITY gnomevfs "<link linkend=&#34;gnomevfs&#34;>GnomeVFS</link>">
 ]>
 
-<!-- $Id: mail-notification.xml,v 1.82 2004/11/25 00:35:55 jylefort Exp $ -->
+<!-- $Id: mail-notification.xml,v 1.94 2005/03/06 21:37:27 jylefort Exp $ -->
 <!-- Mail Notification Manual -->
 
-<!-- Copyright (c) 2004 Jean-Yves Lefort -->
+<!-- Copyright (C) 2004, 2005 Jean-Yves Lefort -->
 <!-- All rights reserved. -->
 
 <!-- Redistribution and use in source (SGML DocBook) and 'compiled' -->
@@ -72,6 +72,7 @@
 
     <copyright>
       <year>2004</year>
+      <year>2005</year>
       <holder>Jean-Yves Lefort</holder>
     </copyright>
 <!-- translators: uncomment this:
@@ -134,6 +135,17 @@
 	</revdescription>
       </revision>
       <revision>
+	<revnumber>Mail Notification Manual V2.10</revnumber>
+	<date>Thursday, November 25, 2004</date>
+	<revdescription>
+	  <para role="author">
+	    Jean-Yves Lefort
+	    <email>jylefort@brutele.be</email>
+	  </para>
+	  <para role="publisher">&project;</para>
+	</revdescription>
+      </revision>
+      <revision>
 	<revnumber>Mail Notification Manual V2.9</revnumber>
 	<date>Monday, November 15, 2004</date>
 	<revdescription>
@@ -342,12 +354,12 @@
 
 	      <varlistentry>
 		<term>--list-features</term>
-		<listitem><para>List compiled-in features and exit</para></listitem>
+		<listitem><para>List the compiled-in features</para></listitem>
 	      </varlistentry>
 
 	      <varlistentry>
-		<term>--display-mail-summary</term>
-		<listitem><para>Display the mail summary dialog</para></listitem>
+		<term>--display-main-window</term>
+		<listitem><para>Display the main window</para></listitem>
 	      </varlistentry>
 
 	      <varlistentry>
@@ -386,12 +398,17 @@
 
 	      <varlistentry>
 		<term>--unset-obsolete-configuration</term>
-		<listitem><para>Unset obsolete GConf configuration and exit</para></listitem>
+		<listitem><para>Unset obsolete GConf configuration</para></listitem>
+	      </varlistentry>
+
+	      <varlistentry>
+		<term>--quit</term>
+		<listitem><para>Quit &app;</para></listitem>
 	      </varlistentry>
 
 	      <varlistentry>
 		<term>--help</term>
-		<listitem><para>Show help and exit</para></listitem>
+		<listitem><para>Show help</para></listitem>
 	      </varlistentry>
 	    </variablelist>
 	  </listitem>
@@ -461,6 +478,99 @@
     </sect2>
   </sect1>
 
+  <sect1 id="main-window">
+    <title>Main Window</title>
+    <para>
+      You can access the main window in the following ways:
+    </para>
+    <variablelist>
+      <varlistentry>
+	<term><guimenu>Applications</guimenu> menu</term>
+	<listitem>
+	  <para>Choose
+	    <menuchoice>
+	      <guisubmenu>Internet</guisubmenu>
+	      <guimenuitem>&app;</guimenuitem>
+	    </menuchoice>.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>Command line</term>
+	<listitem>
+	  <para>
+	    Type the following command, then press <keycap>Return</keycap>:
+	  </para>
+	  <para>
+	    <command>mail-notification --display-main-window</command>
+	  </para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>Mail icon</term>
+	<listitem>
+	  <para>
+	    Right-click on the mail icon and choose
+	    <menuchoice><guimenuitem>Main Window</guimenuitem></menuchoice>.
+	  </para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+	 
+    <para>
+      The main window displays the list of new and unread messages,
+      sorted by sent date in descending order.
+    </para>
+    <para>
+      The main window can also be used to invoke &app; features when
+      the mail icon is hidden.
+    </para>
+
+    <sect2 id="main-window-edit-toolbars">
+      <title>Editing the Main Window Toolbars</title>
+      <para>
+	To edit the main window toolbars, choose
+	<menuchoice> 
+	  <guimenu>Edit</guimenu> 
+	  <guimenuitem>Toolbars</guimenuitem> 
+	</menuchoice>, then:
+      </para>
+      <itemizedlist>
+	<listitem>
+	  <para>
+	    To add or remove buttons from your toolbars, drag icons
+	    from and to the editor.
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    To reset the toolbars configuration to factory defaults,
+	    click on the <guibutton>Use Default</guibutton> button.
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    To add a new toolbar, click on the <guibutton>Add a New
+	    Toolbar</guibutton> button.
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    To remove a toolbar, remove all items from it. The toolbar
+	    will then automatically be removed.
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Drag buttons to rearrange them either on the same toolbar
+	    or between different toolbars.
+	  </para>
+	</listitem>
+      </itemizedlist>
+    </sect2>
+  </sect1>
+    
   <sect1 id="properties"> 
     <title>Properties</title> 
     <para>To configure &app;, choose
@@ -547,10 +657,10 @@
 	  <listitem>
 	    <para>
 	      You can choose an action to be performed when the mail
-	      icon is double-clicked: <guilabel>display the mail summary dialog</guilabel>
-	      or <guilabel>launch the mail reader</guilabel>.
-	      The latter is only available if a mail reader is
-	      configured in the <link linkend="commands">Commands</link> properties.
+	      icon is double-clicked:
+	      <guilabel>display the main window</guilabel>,
+	      <guilabel>launch the mail reader</guilabel> or
+	      <guilabel>update the mail status</guilabel>.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -576,6 +686,11 @@
 			not support <link linkend="immediate-notification">immediate
 			notification</link> of changes.
 		      </para>
+		      <para>
+			If all the mailboxes support <link
+			linkend="immediate-notification">immediate
+			notification</link>, this control is disabled.
+		      </para>
 		    </note>
 		  </para>
 		</listitem>
@@ -617,8 +732,8 @@
 		    will be displayed when new mail arrives.
 		    <note>
 		      <para>
-			The mail summary popup will not be displayed if the <link linkend="mail-summary">Mail Summary</link>
-			dialog is displayed.
+			The mail summary popup will not be displayed
+			if the <link linkend="main-window">main window</link> is displayed.
 		      </para>
 		    </note>
 		  </para>
@@ -691,30 +806,10 @@
 	  <term><guilabel>Fonts</guilabel></term>
 	  <listitem>
 	    <para>
-	      You can choose to override your default desktop font and
+	      You can choose to override your default theme fonts and
 	      use custom fonts in the mail summary popup. To further
 	      customise the appearance of &app;, see <xref linkend="modifying-appearance"/>.
 	    </para>
-	    <variablelist>
-	      <varlistentry>
-		<term><guilabel>Title font</guilabel></term>
-		<listitem>
-		  <para>
-		    If this option is enabled, the title of the mail
-		    summary popup will use the specified font.
-		  </para>
-		</listitem>
-	      </varlistentry>
-	      <varlistentry>
-		<term><guilabel>Contents font</guilabel></term>
-		<listitem>
-		  <para>
-		    If this option is enabled, the contents of the
-		    mail summary popup will use the specified font.
-		  </para>
-		</listitem>
-	      </varlistentry>
-	    </variablelist>
 	    <note>
 	      <para>
 		The specified fonts are relative to the text
@@ -959,32 +1054,6 @@
     </variablelist>
   </sect1>
 
-  <sect1 id="mail-summary">
-    <title>Mail Summary</title>
-    <para>
-      The <guilabel>Mail Summary</guilabel> dialog can be accessed by
-      double-clicking on the mail icon, or by right-clicking on it and
-      choosing <menuchoice><guimenuitem>Mail Summary</guimenuitem></menuchoice>.
-    </para>
-    <para>
-      The <guilabel>Mail Summary</guilabel> dialog displays the list
-      of new and unread messages, sorted by sent date in descending
-      order.
-    </para>
-    <important>
-      <para>
-	To be able to extract messages from mbox, MH, Maildir, POP3,
-	IMAP and Sylpheed mailboxes, &app; must have been compiled
-	with MIME support.
-      </para>
-      <para>
-	&app; has been compiled with MIME support if
-	<command>mail-notification --list-features</command> lists the
-	MIME feature.
-      </para>
-    </important>
-  </sect1>
-
   <sect1 id="troubleshooting">
     <title>Troubleshooting</title>
     <para>
@@ -1048,7 +1117,7 @@
 	  <term>&pop3; and &gmail; mailboxes:</term>
 	  <listitem>
 	    <para>
-	      Immediate notification is not supported.
+	      Immediate notification is not supported by these mailbox types.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -1163,23 +1232,15 @@ endif</programlisting>
 	      <entry>mn-mail-summary-popup-title</entry>
 	    </row>
 	    <row>
-	      <entry>message box</entry>
-	      <entry>mn-message-box</entry>
-	    </row>
-	    <row>
-	      <entry>message header name</entry>
-	      <entry>name</entry>
-	    </row>
-	    <row>
-	      <entry>message header value</entry>
-	      <entry>value</entry>
+	      <entry>message list</entry>
+	      <entry>mn-message-view</entry>
 	    </row>
 	    <row>
 	      <entry>tooltip section title</entry>
 	      <entry>mn-tooltip-section-title</entry>
 	    </row>
 	    <row>
-	      <entry>tooltip section body</entry>
+	      <entry>tooltip section body (except message list)</entry>
 	      <entry>mn-tooltip-section-body</entry>
 	    </row>
 	  </tbody>
@@ -1227,6 +1288,18 @@ endif</programlisting>
 	      <entry>mail summary</entry>
 	      <entry>mn-mail-summary</entry>
 	    </row>
+	    <row>
+	      <entry>mail reader</entry>
+	      <entry>mn-mail-reader</entry>
+	    </row>
+	    <row>
+	      <entry>main window</entry>
+	      <entry>mn-main-window</entry>
+	    </row>
+	    <row>
+	      <entry>leave fullscreen</entry>
+	      <entry>mn-leave-fullscreen</entry>
+	    </row>
 	  </tbody>
 	</tgroup>
       </table>
@@ -1260,7 +1333,7 @@ widget "*.mn-mail-summary-popup-title"
   font_name = "Sans 8"
 }
 
-widget "mn-mail-summary-popup.*.mn-message-box.*"
+widget "mn-mail-summary-popup.*.mn-message-view"
   style "mn-mail-summary-popup-messages"</programlisting>
 	<para>
 	  To use a small font for the mail summary tooltip messages:
@@ -1270,19 +1343,9 @@ widget "mn-mail-summary-popup.*.mn-message-box.*"
   font_name = "Sans 8"
 }
 
-widget "gtk-tooltips.*.mn-message-box.*"
+widget "gtk-tooltips.*.mn-message-view"
   style "mn-mail-summary-tooltip-messages"</programlisting>
 	<para>
-	  To use italic for the message header names:
-	</para>
-	<programlisting>style "mn-message-header-name"
-{
-  font_name = "Italic"
-}
-
-widget "*.mn-message-box.*.name"
-  style "mn-message-header-name"</programlisting>
-	<para>
 	  To use some custom icons:
 	</para>
 	<programlisting>pixmap_path "/home/myaccount/icons"
@@ -1308,7 +1371,7 @@ widget "*" style "mn-icons"</programlisting>
     <title>About &app;</title>
     <para> &app; was written by Jean-Yves Lefort
       (<email>jylefort@brutele.be</email>). To find more information about
-      &app;, please visit the
+      &app;, visit the
       <ulink url="http://www.nongnu.org/mailnotify" type="http">Mail Notification web page</ulink>.
     </para>
     
@@ -1330,6 +1393,7 @@ widget "*" style "mn-icons"</programlisting>
 	<listitem><para>Dan Korostelev</para></listitem>
 	<listitem><para>Filip Miletic</para></listitem>
 	<listitem><para>Phil Nelson</para></listitem>
+	<listitem><para>Maurycy Pawłowski-Wieroński</para></listitem>
 	<listitem><para>Vladimir Petkov</para></listitem>
 	<listitem><para>Tomasz Sarota-Raczek</para></listitem>
 	<listitem><para>Edwin Shin</para></listitem>
diff --git a/help/Makefile.in b/help/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36,9 +36,9 @@ POST_UNINSTALL = :
 subdir = help
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
-	$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/icu.m4 \
+	$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -87,6 +87,7 @@ GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMIME_CFLAGS = @GMIME_CFLAGS@
 GMIME_LIBS = @GMIME_LIBS@
 GMOFILES = @GMOFILES@
@@ -97,6 +98,9 @@ GOB2 = @GOB2@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 ICONV = @ICONV@
+ICU_CFLAGS = @ICU_CFLAGS@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_LIBS = @ICU_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -163,6 +167,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
+WITH_GMAIL_TIMESTAMPS_FALSE = @WITH_GMAIL_TIMESTAMPS_FALSE@
+WITH_GMAIL_TIMESTAMPS_TRUE = @WITH_GMAIL_TIMESTAMPS_TRUE@
 WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
 WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
 WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
diff --git a/m4/Makefile.in b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36,9 +36,9 @@ POST_UNINSTALL = :
 subdir = m4
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
-	$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/icu.m4 \
+	$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -78,6 +78,7 @@ GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMIME_CFLAGS = @GMIME_CFLAGS@
 GMIME_LIBS = @GMIME_LIBS@
 GMOFILES = @GMOFILES@
@@ -88,6 +89,9 @@ GOB2 = @GOB2@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 ICONV = @ICONV@
+ICU_CFLAGS = @ICU_CFLAGS@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_LIBS = @ICU_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -154,6 +158,8 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
+WITH_GMAIL_TIMESTAMPS_FALSE = @WITH_GMAIL_TIMESTAMPS_FALSE@
+WITH_GMAIL_TIMESTAMPS_TRUE = @WITH_GMAIL_TIMESTAMPS_TRUE@
 WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
 WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
 WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
diff --git a/m4/icu.m4 b/m4/icu.m4
@@ -0,0 +1,67 @@
+# This file is part of Mail Notification.
+#
+# Copyright (C) 2005 Jean-Yves Lefort.
+#
+# As a special exception to the Mail Notification licensing terms,
+# Jean-Yves Lefort gives unlimited permission to copy, distribute and
+# modify this file.
+
+dnl AM_PATH_ICU([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl
+AC_DEFUN([AM_PATH_ICU],
+[AC_PATH_PROG(ICU_CONFIG, icu-config, no)
+
+if test "x$ICU_CONFIG" = xno; then
+	ICU_CFLAGS=""
+	ICU_LIBS=""
+
+	ifelse([$3],, :, [$3])
+else
+	ICU_CFLAGS=`$ICU_CONFIG --cppflags`
+	ICU_LIBS=`$ICU_CONFIG --ldflags`
+
+	# the version checking API we need has been introduced in 2.4
+	icu_min_version=ifelse([$1],, 2.4, [$1])
+
+	ac_save_CFLAGS="$CFLAGS"
+	ac_save_LIBS="$LIBS"
+	CFLAGS="$CFLAGS $ICU_CFLAGS"
+	LIBS="$LIBS $ICU_LIBS"
+
+	AC_MSG_CHECKING([for ICU - version >= $icu_min_version])
+
+	AC_RUN_IFELSE([
+#include <string.h>
+#include <unicode/uversion.h>
+
+int main() {
+  UVersionInfo min_version;
+  UVersionInfo version;
+
+  u_versionFromString(min_version, "$icu_min_version");
+  u_getVersion(version);
+
+  if (memcmp(min_version, version, U_MAX_VERSION_LENGTH) > 0)
+    exit(1); /* version too old */
+
+  exit(0);
+}
+], [found=yes], [found=no], [found=yes])
+
+	AC_MSG_RESULT($found)
+
+	CFLAGS="$ac_save_CFLAGS"
+	LIBS="$ac_save_LIBS"
+
+	if test $found = yes; then
+		ifelse([$2],, :, [$2])
+	else
+		ICU_CFLAGS=""
+		ICU_LIBS=""
+
+		ifelse([$3],, :, [$3])
+	fi
+fi
+
+AC_SUBST(ICU_CFLAGS)
+AC_SUBST(ICU_LIBS)])
diff --git a/m4/openssl.m4 b/m4/openssl.m4
@@ -1,8 +1,6 @@
-# $Id: openssl.m4,v 1.1 2004/08/04 22:54:08 jylefort Exp $
-#
 # This file is part of Mail Notification.
 #
-# Copyright (c) 2004 Jean-Yves Lefort.
+# Copyright (C) 2004 Jean-Yves Lefort.
 #
 # As a special exception to the Mail Notification licensing terms,
 # Jean-Yves Lefort gives unlimited permission to copy, distribute and
diff --git a/m4/sasl2.m4 b/m4/sasl2.m4
@@ -1,8 +1,6 @@
-# $Id: sasl2.m4,v 1.2 2004/08/04 22:54:08 jylefort Exp $
-#
 # This file is part of Mail Notification.
 #
-# Copyright (c) 2004 Jean-Yves Lefort.
+# Copyright (C) 2004 Jean-Yves Lefort.
 #
 # As a special exception to the Mail Notification licensing terms,
 # Jean-Yves Lefort gives unlimited permission to copy, distribute and
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -5,6 +5,12 @@ data/mail-notification.desktop.in
 data/mail-notification.schemas.in
 data/mail-notification.soundlist.in
 src/MNAutomation.idl
+src/egg-editable-toolbar.c
+src/egg-editable-toolbar.h
+src/egg-toolbar-editor.c
+src/egg-toolbar-editor.h
+src/egg-toolbars-model.c
+src/egg-toolbars-model.h
 src/eggtrayicon.c
 src/eggtrayicon.h
 src/mn-about-dialog.gob
@@ -20,6 +26,8 @@ src/mn-conf.h
 src/mn-gmail-mailbox-properties.gob
 src/mn-gmail-mailbox.gob
 src/mn-gmime-stream-vfs.gob
+src/mn-icu.c
+src/mn-icu.h
 src/mn-imap-mailbox-properties.gob
 src/mn-imap-mailbox.gob
 src/mn-mail-icon.gob
@@ -33,21 +41,23 @@ src/mn-mailbox-view.gob
 src/mn-mailbox.gob
 src/mn-mailboxes.gob
 src/mn-maildir-mailbox.gob
+src/mn-main-window.c
+src/mn-main-window.h
 src/mn-main.c
 src/mn-mbox-mailbox.gob
 src/mn-md5.c
 src/mn-md5.h
-src/mn-message-box.gob
 src/mn-message-mime.c
 src/mn-message-mime.h
+src/mn-message-view.gob
 src/mn-message.gob
 src/mn-mh-mailbox.gob
 src/mn-pending-mailbox.gob
 src/mn-pi-mailbox-properties.gob
 src/mn-pop3-mailbox-properties.gob
 src/mn-pop3-mailbox.gob
-src/mn-properties.c
-src/mn-properties.h
+src/mn-properties-dialog.c
+src/mn-properties-dialog.h
 src/mn-sasl.c
 src/mn-sasl.h
 src/mn-sgml-ref.c
@@ -59,12 +69,8 @@ src/mn-ssl.c
 src/mn-ssl.h
 src/mn-stock.c
 src/mn-stock.h
-src/mn-summary-dialog.c
-src/mn-summary-dialog.h
 src/mn-summary-popup.c
 src/mn-summary-popup.h
-src/mn-summary.c
-src/mn-summary.h
 src/mn-sylpheed-mailbox.gob
 src/mn-system-mailbox-properties.gob
 src/mn-tooltips.gob
@@ -75,8 +81,9 @@ src/mn-util.h
 src/mn-vfs.c
 src/mn-vfs.h
 ui/authentication.glade
+ui/edit-toolbars.glade
 ui/mailbox-properties.glade
+ui/main.glade
 ui/properties.glade
-ui/summary-dialog.glade
 ui/summary-popup.glade
 ui/welcome.glade
diff --git a/po/bg.gmo b/po/bg.gmo
Binary files differ.
diff --git a/po/bg.po b/po/bg.po
@@ -1,5 +1,5 @@
 # Bulgarian translations for mail-notification.
-# Copyright (c) 2003, 2004 Jean-Yves Lefort.
+# Copyright (C) 2003, 2004 Jean-Yves Lefort.
 #
 # This file is distributed under the same license as the
 # mail-notification package.
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome in bulgarian 0.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-25 01:43+0100\n"
+"POT-Creation-Date: 2005-03-02 02:32+0100\n"
 "PO-Revision-Date: 2004-10-05 16:13+0200\n"
 "Last-Translator: Vladimir \"Kaladan\" Petkov <vpetkov@i-space.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -27,14 +27,14 @@ msgstr "Автоматизиране на известяването за пощ
 msgid "Mail Notification automation factory"
 msgstr "Фабрика за автоматизирането на известяването за поща"
 
-#: data/mail-notification-properties.desktop.in.h:1
+#: data/mail-notification-properties.desktop.in.h:1 src/mn-main-window.c:145
 msgid "Configure Mail Notification"
 msgstr "Настройване на известяването за поща"
 
 #: data/mail-notification-properties.desktop.in.h:2
 #: data/mail-notification.desktop.in.h:2
-#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:40
-#: src/mn-mail-icon.gob:194 src/mn-main.c:281
+#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:39
+#: src/mn-mail-icon.gob:224 src/mn-main.c:292 ui/main.glade.h:1
 msgid "Mail Notification"
 msgstr "Известяване за поща"
 
@@ -85,259 +85,294 @@ msgstr "Вече е стартиран"
 
 #: data/mail-notification.schemas.in.h:11
 #, fuzzy
-msgid "Height of mail summary dialog"
+msgid "Height of edit toolbars dialog"
 msgstr "Височина на диалоговия прозорец за настройките"
 
 #: data/mail-notification.schemas.in.h:12
+msgid "Height of main window"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:13
 msgid "Height of properties dialog"
 msgstr "Височина на диалоговия прозорец за настройките"
 
-#: data/mail-notification.schemas.in.h:13
+#: data/mail-notification.schemas.in.h:14
 #, fuzzy
 msgid "Mail read command"
 msgstr "Нова команда за поща"
 
-#: data/mail-notification.schemas.in.h:14
+#: data/mail-notification.schemas.in.h:15
 #, fuzzy
 msgid "Mail reader command"
 msgstr "Нова команда за поща"
 
-#: data/mail-notification.schemas.in.h:15
+#: data/mail-notification.schemas.in.h:16
 msgid "Mail summary popup contents font"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:16
+#: data/mail-notification.schemas.in.h:17
+msgid "Mail summary popup fonts aspect source"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:18
 msgid "Mail summary popup horizontal offset"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:17
+#: data/mail-notification.schemas.in.h:19
 msgid "Mail summary popup position"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:18
+#: data/mail-notification.schemas.in.h:20
 msgid "Mail summary popup title font"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:19
+#: data/mail-notification.schemas.in.h:21
 msgid "Mail summary popup vertical offset"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:20
+#: data/mail-notification.schemas.in.h:22
 #, fuzzy
 msgid "Mailbox list"
 msgstr "Списък на пощенските кутии"
 
-#: data/mail-notification.schemas.in.h:21
+#: data/mail-notification.schemas.in.h:23
 msgid "Minutes between mail checks"
 msgstr "Минути между проверките"
 
-#: data/mail-notification.schemas.in.h:22
+#: data/mail-notification.schemas.in.h:24
 msgid "Minutes to wait before closing the mail summary popup"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:23
+#: data/mail-notification.schemas.in.h:25
 msgid "New mail command"
 msgstr "Нова команда за поща"
 
-#: data/mail-notification.schemas.in.h:24
+#: data/mail-notification.schemas.in.h:26
 msgid "Only display recent mail in mail summary popup"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:25
+#: data/mail-notification.schemas.in.h:27
 #, fuzzy
 msgid "Run a command when all mail is read"
 msgstr "Стартиране на команда при пристигането на нова поща"
 
-#: data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:28
 msgid "Run a command when new mail arrives"
 msgstr "Стартиране на команда при пристигането на нова поща"
 
-#: data/mail-notification.schemas.in.h:27
+#: data/mail-notification.schemas.in.h:29
 msgid "Seconds between mail checks"
 msgstr "Секунди между проверките за поща"
 
-#: data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:30
 msgid "Seconds to wait before closing the mail summary popup"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:29
+#: data/mail-notification.schemas.in.h:31
 #, fuzzy
 msgid "Set a mail reader"
 msgstr "Избор на файл или папка"
 
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:32
 msgid ""
 "The action to perform when the icon is double-clicked. Must be \"display-"
-"mail-summary\" or \"launch-mail-reader\"."
+"main-window\", \"launch-mail-reader\" or \"update-mail-status\"."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:33
 #, fuzzy
 msgid ""
 "The amount of time to wait before closing the mail summary popup (minutes "
 "part)."
 msgstr "Времевият интервал за изчакване между проверките за нова поща"
 
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:34
 #, fuzzy
 msgid ""
 "The amount of time to wait before closing the mail summary popup (seconds "
 "part)."
 msgstr "Времевият интервал за изчакване между проверките за нова поща"
 
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:35
+msgid ""
+"The aspect source of the mail summary popup fonts. Must be \"theme\" or "
+"\"custom\"."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:36
 #, fuzzy
 msgid "The command to run to launch the mail reader."
 msgstr "Командата, която да се стартира при пристигането на нова поща."
 
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:37
 #, fuzzy
 msgid "The command to run when all mail is read."
 msgstr "Командата, която да се стартира при пристигането на нова поща."
 
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:38
 msgid "The command to run when new mail arrives."
 msgstr "Командата, която да се стартира при пристигането на нова поща."
 
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:39
 msgid "The custom font to use for the contents of the mail summary popup."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:40
 msgid "The custom font to use for the title of the mail summary popup."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:38
+#: data/mail-notification.schemas.in.h:41
 #, fuzzy
-msgid "The height of the mail summary dialog in pixels."
+msgid "The height of the edit toolbars dialog in pixels."
 msgstr "Височината в пиксели на диалоговия прозорец за настройките."
 
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:42
+#, fuzzy
+msgid "The height of the main window in pixels."
+msgstr "Височината в пиксели на диалоговия прозорец за настройките."
+
+#: data/mail-notification.schemas.in.h:43
 msgid "The height of the properties dialog in pixels."
 msgstr "Височината в пиксели на диалоговия прозорец за настройките."
 
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:44
 msgid "The list of mailboxes to monitor."
 msgstr "Списъкът на пощенските кутии за следене."
 
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:45
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:46
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
 msgstr ""
 "Списъкът на проверените сертификати тип X509, представени от техните "
 "пръстови отпечатъци в MD5 формат."
 
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:47
 msgid ""
 "The number of pixels to leave between the left or right side of the screen "
 "and the mail summary popup."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:48
 msgid ""
 "The number of pixels to leave between the top or bottom side of the screen "
 "and the mail summary popup."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:49
 msgid ""
 "The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
 "\"bottom-left\" or \"bottom-right\"."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:46
+#: data/mail-notification.schemas.in.h:50
+msgid ""
+"The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text\", "
+"\"both\" or \"both-horiz\"."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:51
 #, fuzzy
-msgid "The width of the mail summary dialog in pixels."
+msgid "The width of the edit toolbars dialog in pixels."
 msgstr "Ширината на диалоговия прозорец за настройките в пиксели."
 
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:52
+#, fuzzy
+msgid "The width of the main window in pixels."
+msgstr "Ширината на диалоговия прозорец за настройките в пиксели."
+
+#: data/mail-notification.schemas.in.h:53
 msgid "The width of the properties dialog in pixels."
 msgstr "Ширината на диалоговия прозорец за настройките в пиксели."
 
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:54
+msgid "Toolbars style"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:55
 msgid "Trusted servers list"
 msgstr "Списък на проверените сървъри"
 
-#: data/mail-notification.schemas.in.h:49
-msgid "Use a custom font for the contents of the mail summary popup"
+#: data/mail-notification.schemas.in.h:56
+msgid "View statusbar"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:50
-msgid "Use a custom font for the title of the mail summary popup"
+#: data/mail-notification.schemas.in.h:57
+msgid "View toolbars"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:58
 msgid "Whether Mail Notification has already been run or not."
 msgstr "Дали известяването за поща вече е стартирано или не."
 
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:59
 msgid "Whether the status icon should blink on errors or not."
 msgstr "Дали иконата за състоянието да мига при грешки или не"
 
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:60
+#, fuzzy
+msgid "Whether the statusbar should be visible or not."
+msgstr "Дали иконата за състоянието да мига при грешки или не"
+
+#: data/mail-notification.schemas.in.h:61
+#, fuzzy
+msgid "Whether the toolbars should be visible or not."
+msgstr "Дали иконата за състоянието да мига при грешки или не"
+
+#: data/mail-notification.schemas.in.h:62
 #, fuzzy
 msgid "Whether to automatically close the mail summary popup or not."
 msgstr "Дали да се стартира команда при пристигането на нова поща или не"
 
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:63
 msgid "Whether to display the mail summary in the status icon tooltip or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:64
 #, fuzzy
 msgid "Whether to display the mail summary popup when new mail arrives or not."
 msgstr "Дали да се стартира команда при пристигането на нова поща или не"
 
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:65
 msgid ""
 "Whether to hide previously displayed mail in the mail summary popup or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:66
 msgid ""
 "Whether to prevent the immediate notification error dialog from being "
 "displayed or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:67
 #, fuzzy
 msgid "Whether to run a command when all mail is read or not."
 msgstr "Дали да се стартира команда при пристигането на нова поща или не"
 
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:68
 msgid "Whether to run a command when new mail arrives or not."
 msgstr "Дали да се стартира команда при пристигането на нова поща или не"
 
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:69
 #, fuzzy
 msgid "Whether to set a mail reader or not."
 msgstr "Дали известяването за поща вече е стартирано или не."
 
-#: data/mail-notification.schemas.in.h:61
-#, fuzzy
-msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
-"not."
-msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-
-#: data/mail-notification.schemas.in.h:62
-#, fuzzy
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not."
-msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-
-#: data/mail-notification.schemas.in.h:63
+#: data/mail-notification.schemas.in.h:70
 #, fuzzy
-msgid "Width of mail summary dialog"
+msgid "Width of edit toolbars dialog"
 msgstr "Ширина на диалоговия прозорец за настройките"
 
-#: data/mail-notification.schemas.in.h:64
+#: data/mail-notification.schemas.in.h:71
+msgid "Width of main window"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:72
 msgid "Width of properties dialog"
 msgstr "Ширина на диалоговия прозорец за настройките"
 
@@ -345,6 +380,20 @@ msgstr "Ширина на диалоговия прозорец за настр
 msgid "New Mail"
 msgstr "Нова поща"
 
+#: src/egg-editable-toolbar.c:536
+msgid "_Remove Toolbar"
+msgstr ""
+
+#: src/egg-toolbar-editor.c:558
+msgid "Separator"
+msgstr ""
+
+#: src/egg-toolbar-editor.c:588
+msgid ""
+"Drag an item onto the toolbars above to add it, from the toolbars in the "
+"items table to remove it."
+msgstr ""
+
 #: src/eggtrayicon.c:109
 msgid "Orientation"
 msgstr "Ориентация"
@@ -353,20 +402,20 @@ msgstr "Ориентация"
 msgid "The orientation of the tray."
 msgstr ""
 
-#: src/mn-about-dialog.gob:43
+#: src/mn-about-dialog.gob:42
 msgid "A Mail Notification Icon"
 msgstr "Уведомяване за поща"
 
 #. translator: replace with your name and email
-#: src/mn-about-dialog.gob:47
+#: src/mn-about-dialog.gob:46
 msgid "Jean-Yves Lefort <jylefort@brutele.be>"
 msgstr "Vladimir Petkov <vpetkov@i-space.org>"
 
-#: src/mn-auth-combo-box.gob:101 src/mn-autodetect-mailbox-properties.gob:37
+#: src/mn-auth-combo-box.gob:102 src/mn-autodetect-mailbox-properties.gob:39
 msgid "<span style=\"italic\">autodetect</span>"
 msgstr "<span style=\"italic\">автоматично засичане</span>"
 
-#: src/mn-authenticated-mailbox.gob:80
+#: src/mn-authenticated-mailbox.gob:85
 #, c-format
 msgid ""
 "Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -375,12 +424,12 @@ msgid ""
 "Please re-enter your password."
 msgstr ""
 
-#: src/mn-authenticated-mailbox.gob:81
+#: src/mn-authenticated-mailbox.gob:86
 #, c-format
 msgid "Enter your password for %s mailbox %s."
 msgstr ""
 
-#: src/mn-authenticated-mailbox.gob:132
+#: src/mn-authenticated-mailbox.gob:137
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Mail Notification requires a password</"
@@ -389,11 +438,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/mn-autodetect-mailbox-properties.gob:68
+#: src/mn-autodetect-mailbox-properties.gob:70
 msgid "_Location:"
 msgstr "_Местоположение:"
 
-#: src/mn-autodetect-mailbox-properties.gob:74
+#: src/mn-autodetect-mailbox-properties.gob:76
 msgid "_Browse..."
 msgstr "_Разглеждане..."
 
@@ -401,7 +450,7 @@ msgstr "_Разглеждане..."
 msgid "The URI of the mailbox"
 msgstr "Адресът на пощенската кутия"
 
-#: src/mn-autodetect-mailbox-properties.gob:118
+#: src/mn-autodetect-mailbox-properties.gob:123
 msgid "Select a File or Folder"
 msgstr "Избор на файл или папка"
 
@@ -531,156 +580,190 @@ msgstr "неуспех при четенето от сървър: EOF"
 msgid "unable to decode data using SASL: %s"
 msgstr ""
 
-#: src/mn-client-session.c:746
+#: src/mn-client-session.c:743
 #, c-format
 msgid "unable to encode data using SASL: %s"
 msgstr ""
 
-#: src/mn-client-session.c:777 src/mn-client-session.c:784
+#: src/mn-client-session.c:774 src/mn-client-session.c:781
 #, c-format
 msgid "unable to write to server: %s"
 msgstr "неуспех при записването на сървър: %s"
 
-#: src/mn-client-session.c:782
+#: src/mn-client-session.c:779
 msgid "unable to write to server: EOF"
 msgstr "неуспех при записването на сървър: EOF"
 
-#: src/mn-client-session.c:814
+#: src/mn-client-session.c:811
 #, c-format
 msgid "unable to encode Base64: %s"
 msgstr ""
 
-#: src/mn-client-session.c:925
+#: src/mn-client-session.c:922
 #, c-format
 msgid "unable to initialize the SASL library: %s"
 msgstr ""
 
-#: src/mn-client-session.c:934
+#: src/mn-client-session.c:931
 #, c-format
 msgid "unable to retrieve local address of socket: %s"
 msgstr ""
 
-#: src/mn-client-session.c:940
+#: src/mn-client-session.c:937
 #, c-format
 msgid "unable to retrieve remote address of socket: %s"
 msgstr ""
 
-#: src/mn-client-session.c:974
-#, c-format
-msgid "warning: unable to set SASL security properties: %s"
-msgstr ""
+#: src/mn-client-session.c:971
+#, fuzzy, c-format
+msgid "unable to set SASL security properties: %s"
+msgstr "неуспех при записването на сървър: %s"
 
-#: src/mn-client-session.c:998
+#: src/mn-client-session.c:995
 msgid ""
 "unable to start SASL authentication: SASL asked for something we did not know"
 msgstr ""
 
-#: src/mn-client-session.c:1017
+#: src/mn-client-session.c:1014
 #, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr ""
 
-#: src/mn-client-session.c:1021
+#: src/mn-client-session.c:1018
 #, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr ""
 
-#: src/mn-client-session.c:1058
+#: src/mn-client-session.c:1055
 msgid "SASL asked for something we did not know, aborting SASL authentication"
 msgstr ""
 
-#: src/mn-client-session.c:1075
+#: src/mn-client-session.c:1072
 #, c-format
 msgid "%s, aborting SASL authentication"
 msgstr ""
 
 #. compliance error
-#: src/mn-client-session.c:1080
+#: src/mn-client-session.c:1077
 #, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr ""
 
-#: src/mn-client-session.c:1083
+#: src/mn-client-session.c:1080
 msgid ""
 "the server sent a SASL challenge, but there was a pending initial SASL "
 "client response"
 msgstr ""
 
-#: src/mn-client-session.c:1097
+#: src/mn-client-session.c:1094
 msgid ""
 "the server did not send a SASL challenge, but there was no pending initial "
 "SASL client response"
 msgstr ""
 
-#: src/mn-client-session.c:1122
+#: src/mn-client-session.c:1119
 #, c-format
 msgid "a SASL security layer of strength factor %i is now active"
 msgstr ""
 
 #. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: src/mn-client-session.c:1127
+#: src/mn-client-session.c:1124
 #, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr ""
 
-#: src/mn-client-session.c:1133
+#: src/mn-client-session.c:1130
 #, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr ""
 
-#: src/mn-conf.c:145
+#: src/mn-conf.c:238
+#, fuzzy
+msgid "A directory creation error has occurred"
+msgstr "Получи се грешка при наблюдението"
+
+#: src/mn-conf.c:239
+#, fuzzy, c-format
+msgid "Unable to create directory \"%s\": %s."
+msgstr "Неуспех при създаването на нишка: %s."
+
+#: src/mn-conf.c:313
 #, c-format
 msgid "recursively unsetting %s"
 msgstr ""
 
-#: src/mn-conf.c:149
+#: src/mn-conf.c:317
 msgid "syncing the GConf database"
 msgstr "синхронизиране на базата данни на GConf"
 
-#: src/mn-conf.c:152
+#: src/mn-conf.c:320
 msgid "completed"
 msgstr "завършено"
 
-#: src/mn-gmail-mailbox-properties.gob:77
+#: src/mn-gmail-mailbox-properties.gob:76
 msgid "Your Gmail username"
 msgstr "Вашето Gmail потребителско име"
 
-#: src/mn-gmail-mailbox-properties.gob:78
+#: src/mn-gmail-mailbox-properties.gob:77
 msgid ""
 "Your Gmail password (if left blank, you will be prompted for the password "
 "when needed)"
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:82
+#: src/mn-gmail-mailbox.gob:86
 msgid "libsoup has not been compiled with SSL/TLS support"
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:160
+#: src/mn-gmail-mailbox.gob:164
 #, fuzzy, c-format
 msgid "unable to parse URI \"%s\""
 msgstr "неуспех при преглед на отговор \"%s\""
 
-#: src/mn-gmail-mailbox.gob:214
+#: src/mn-gmail-mailbox.gob:217
+msgid "received non-UTF-8 data from server"
+msgstr ""
+
+#: src/mn-gmail-mailbox.gob:224
 #, c-format
 msgid "unable to transfer data: %s"
 msgstr "неуспех при пренасянето на данни: %s"
 
-#: src/mn-gmail-mailbox.gob:335
+#: src/mn-gmail-mailbox.gob:345
 msgid "logging in"
 msgstr "влизане"
 
-#: src/mn-gmail-mailbox.gob:413
+#: src/mn-gmail-mailbox.gob:423
 msgid "login failed"
 msgstr "влизането е неуспешно"
 
-#: src/mn-gmail-mailbox.gob:488
+#: src/mn-gmail-mailbox.gob:496
 msgid "searching for unread mail"
 msgstr "търсене за непрочетена поща"
 
 #: src/mn-gmail-mailbox.gob:527
+#, fuzzy
+msgid "unable to initialize the ICU library"
+msgstr "Неуспех при инициализирането на библиотеката GnomeVFS."
+
+#: src/mn-gmail-mailbox.gob:554
 msgid "unable to parse Gmail data"
 msgstr "неуспех при прегледа на данни от Gmail"
 
+#: src/mn-gmail-mailbox.gob:891
+#, fuzzy, c-format
+msgid "unable to open calendar: %s"
+msgstr "неуспех при отварянето на папката: %s"
+
+#: src/mn-gmail-mailbox.gob:899
+#, fuzzy, c-format
+msgid "unable to set calendar time: %s"
+msgstr "неуспех при затварянето на папката: %s"
+
+#: src/mn-gmail-mailbox.gob:968
+#, fuzzy, c-format
+msgid "unable to get calendar time: %s"
+msgstr "неуспех при пренасянето на данни: %s"
+
 #: src/mn-gmime-stream-vfs.gob:49
 #, fuzzy, c-format
 msgid "unable to read %s: %s"
@@ -706,19 +789,19 @@ msgstr "неуспех при следенето %s: %s"
 msgid "unable to close %s: %s"
 msgstr "неуспех при затварянето на папката: %s"
 
-#: src/mn-imap-mailbox-properties.gob:94
+#: src/mn-imap-mailbox-properties.gob:95
 msgid "Mailbox:"
 msgstr "Пощенска кутия:"
 
-#: src/mn-imap-mailbox-properties.gob:98
+#: src/mn-imap-mailbox-properties.gob:99
 msgid "in_box"
 msgstr "ку_тия"
 
-#: src/mn-imap-mailbox-properties.gob:109
+#: src/mn-imap-mailbox-properties.gob:110
 msgid "oth_er:"
 msgstr "др_уги"
 
-#: src/mn-imap-mailbox-properties.gob:121
+#: src/mn-imap-mailbox-properties.gob:122
 msgid "U_se idle mode if possible"
 msgstr ""
 
@@ -749,76 +832,75 @@ msgstr "Име на пощенската кутия"
 msgid "If possible, whether to use idle mode or not"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:166 src/mn-pop3-mailbox.gob:143
+#: src/mn-imap-mailbox.gob:156 src/mn-pop3-mailbox.gob:136
 msgid "SSL/TLS support has not been compiled in"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:246
+#: src/mn-imap-mailbox.gob:236
 msgid "server did not send capabilities"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:418
+#: src/mn-imap-mailbox.gob:408
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:419
+#: src/mn-imap-mailbox.gob:409
 msgid "unable to login"
 msgstr "неуспех при влизането"
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:571
+#: src/mn-imap-mailbox.gob:542
 #, fuzzy
 msgid "server did not send search results"
 msgstr "сървърът не изпраща състоянието"
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:651
+#: src/mn-imap-mailbox.gob:617
 #, fuzzy
 msgid "server did not send all the messages we requested"
 msgstr "сървърът не изпраща състоянието"
 
-#: src/mn-imap-mailbox.gob:700
+#: src/mn-imap-mailbox.gob:671
 #, fuzzy
 msgid "unable to fetch message"
 msgstr "неуспех при свързването: %s"
 
-#. compliance error
-#: src/mn-imap-mailbox.gob:818
-msgid "server did not send status"
-msgstr "сървърът не изпраща състоянието"
-
-#: src/mn-imap-mailbox.gob:1096 src/mn-pop3-mailbox.gob:972
+#: src/mn-imap-mailbox.gob:1006 src/mn-pop3-mailbox.gob:927
 msgid "unknown server error"
 msgstr "неизвестна грешка в сървъра"
 
-#: src/mn-imap-mailbox.gob:1198 src/mn-pop3-mailbox.gob:227
+#: src/mn-imap-mailbox.gob:1108 src/mn-pop3-mailbox.gob:220
 msgid "server does not support in-band SSL/TLS"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:1217 src/mn-pop3-mailbox.gob:885
+#: src/mn-imap-mailbox.gob:1127 src/mn-pop3-mailbox.gob:837
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:1225 src/mn-pop3-mailbox.gob:897
+#: src/mn-imap-mailbox.gob:1137 src/mn-pop3-mailbox.gob:857
 #, c-format
 msgid "unknown authentication mechanism \"%s\""
 msgstr "неизвестен механизъм за идентификация \"%s\""
 
-#: src/mn-imap-mailbox.gob:1246
+#: src/mn-imap-mailbox.gob:1160
 msgid "falling back to IMAP LOGIN authentication"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:1257 src/mn-pop3-mailbox.gob:938
+#: src/mn-imap-mailbox.gob:1172 src/mn-pop3-mailbox.gob:901
 msgid "authentication failed"
 msgstr "неуспешна идентификация"
 
-#: src/mn-mail-icon.gob:92 ui/summary-dialog.glade.h:2
-msgid "_Launch Mail Reader"
+#: src/mn-mail-icon.gob:91
+msgid "Main _Window"
 msgstr ""
 
-#: src/mn-mail-icon.gob:93 ui/summary-dialog.glade.h:3
+#: src/mn-mail-icon.gob:92 src/mn-main-window.c:101
+msgid "_Mail Reader"
+msgstr ""
+
+#: src/mn-mail-icon.gob:93 src/mn-main-window.c:109
 msgid "_Update"
 msgstr "_Актуализиране"
 
@@ -826,20 +908,20 @@ msgstr "_Актуализиране"
 msgid "R_emove From Notification Area"
 msgstr "Пре_махване от зоната за известяване"
 
-#: src/mn-mailbox-properties-dialog.c:109
+#: src/mn-mailbox-properties-dialog.c:156
 msgid "Add a Mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: src/mn-mailbox-properties-dialog.c:328
+#: src/mn-mailbox-properties-dialog.c:325
 #, c-format
 msgid "%s Properties"
 msgstr "%s Настройки"
 
-#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:4
+#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:3
 msgid "_Username:"
 msgstr "_Име:"
 
-#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:3
+#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:2
 msgid "_Password:"
 msgstr "_Парола:"
 
@@ -879,64 +961,60 @@ msgstr "Завършено"
 msgid "Whether the properties are completely filled or not"
 msgstr ""
 
-#: src/mn-mailbox-view.gob:263 src/mn-message-box.gob:61
+#: src/mn-mailbox-view.gob:271 src/mn-message-view.gob:312
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
 #. format column
-#: src/mn-mailbox-view.gob:279
+#: src/mn-mailbox-view.gob:287
 msgid "Format"
 msgstr "Формат"
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "Unable to add mailbox"
 msgstr "Неуспех при добавянето на пощенската кутия"
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "The mailbox is already in the list."
 msgstr "Пощенската кутия е вече в списъка."
 
-#: src/mn-mailbox.gob:130
+#: src/mn-mailbox.gob:131
 msgid "The mailbox URI"
 msgstr "Адресът на пощенската кутия"
 
-#: src/mn-mailbox.gob:141
+#: src/mn-mailbox.gob:142
 msgid "The mailbox human-readable name"
 msgstr "Името на пощенската кутия във формат разбираем от хора"
 
-#: src/mn-mailbox.gob:145
+#: src/mn-mailbox.gob:146
 #, fuzzy
 msgid "Whether the mailbox has to be polled or not"
 msgstr "Дали изображението да мига или не"
 
-#: src/mn-mailbox.gob:151
-msgid "Whether the mailbox has new mail or not"
-msgstr ""
-
-#: src/mn-mailbox.gob:156
+#: src/mn-mailbox.gob:152
 msgid "The list of new and unread MNMessage objects"
 msgstr ""
 
-#: src/mn-mailbox.gob:210
+#: src/mn-mailbox.gob:206
 msgid "The mailbox error, if any"
 msgstr "Грешката в пощенската кутия, ако има"
 
-#: src/mn-mailbox.gob:309
+#: src/mn-mailbox.gob:305
 msgid "does not exist"
 msgstr "не съществува"
 
-#: src/mn-mailbox.gob:341
+#: src/mn-mailbox.gob:337
 msgid "unknown format"
 msgstr "непознат формат"
 
-#: src/mn-mailbox.gob:407
+#: src/mn-mailbox.gob:403
 #, fuzzy, c-format
-msgid "unable to enable immediate notification for %s: %s"
+msgid "unable to enable immediate notification: %s"
 msgstr ""
 "Известяването за поща не можа да разреши моменталното известяване за една "
 "или повече пощенски кутии. %s"
 
-#: src/mn-mailbox.gob:425
+#: src/mn-mailbox.gob:421
 #, c-format
 msgid ""
 "As a fallback, they will be checked every %i second (this delay is "
@@ -947,7 +1025,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-mailbox.gob:436
+#: src/mn-mailbox.gob:432
 #, c-format
 msgid ""
 "As a fallback, they will be checked every %i minute (this delay is "
@@ -958,7 +1036,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-mailbox.gob:447
+#: src/mn-mailbox.gob:443
 #, c-format
 msgid ""
 "As a fallback, they will be checked approximately every %i minute (this "
@@ -969,11 +1047,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-mailbox.gob:463
+#: src/mn-mailbox.gob:459
 msgid "A monitoring error has occurred"
 msgstr "Получи се грешка при наблюдението"
 
-#: src/mn-mailbox.gob:464
+#: src/mn-mailbox.gob:460
 #, c-format
 msgid ""
 "Mail Notification was unable to enable immediate notification for one or "
@@ -982,125 +1060,292 @@ msgstr ""
 "Известяването за поща не можа да разреши моменталното известяване за една "
 "или повече пощенски кутии. %s"
 
-#: src/mn-mailboxes.gob:142
+#: src/mn-mailboxes.gob:130
 msgid "Whether one or more of the mailboxes has to be polled"
 msgstr ""
 
-#: src/mn-mailboxes.gob:272
+#: src/mn-mailboxes.gob:260
 #, c-format
 msgid "%s is unsupported: %s"
 msgstr "%s е неподдържан: %s"
 
-#: src/mn-mailboxes.gob:304
-#, c-format
-msgid "%s has new mail"
-msgstr "%s има поща"
-
-#: src/mn-mailboxes.gob:304
-#, c-format
-msgid "%s has no new mail"
-msgstr "%s няма нова поща"
+#: src/mn-mailboxes.gob:290
+#, fuzzy, c-format
+msgid "%s has %i new message"
+msgid_plural "%s has %i new messages"
+msgstr[0] "%s има поща"
+msgstr[1] "%s има поща"
 
-#: src/mn-mailboxes.gob:330
+#: src/mn-mailboxes.gob:307
 #, c-format
 msgid "%s reported an error: %s"
 msgstr "%s докладва за грешка: %s"
 
-#: src/mn-maildir-mailbox.gob:119
+#: src/mn-maildir-mailbox.gob:112
 #, c-format
 msgid "unable to open folder \"new\": %s"
 msgstr "неуспех при отварянето на папка \"нови\": %s"
 
-#: src/mn-maildir-mailbox.gob:161
+#: src/mn-maildir-mailbox.gob:141
 #, c-format
 msgid "unable to close folder \"new\": %s"
 msgstr "неуспех при отварянето на папка \"нови\": %s"
 
-#: src/mn-maildir-mailbox.gob:164
+#: src/mn-maildir-mailbox.gob:144
 #, c-format
 msgid "error while reading folder \"new\": %s"
 msgstr "грешка при четенето на папката \"нови\": %s"
 
+#. Toplevel
+#: src/mn-main-window.c:92
+#, fuzzy
+msgid "_Mail"
+msgstr "Пощенска кутия"
+
+#: src/mn-main-window.c:93
+msgid "_Edit"
+msgstr ""
+
+#: src/mn-main-window.c:94
+msgid "_View"
+msgstr ""
+
+#: src/mn-main-window.c:95
+msgid "_Help"
+msgstr ""
+
+#: src/mn-main-window.c:103
+msgid "Launch the mail reader"
+msgstr ""
+
+#. Reload
+#: src/mn-main-window.c:111 src/mn-main.c:230
+msgid "Update the mail status"
+msgstr "Актуализиране състоянието на пощата"
+
+#: src/mn-main-window.c:117
+msgid "_Close"
+msgstr ""
+
+#: src/mn-main-window.c:119
+msgid "Close this window"
+msgstr ""
+
+#: src/mn-main-window.c:125
+msgid "_Quit"
+msgstr ""
+
+#: src/mn-main-window.c:127 src/mn-main.c:257
+#, fuzzy
+msgid "Quit Mail Notification"
+msgstr "Известяване за поща"
+
+#: src/mn-main-window.c:135 src/mn-main-window.c:183
+msgid "_Toolbars"
+msgstr ""
+
+#: src/mn-main-window.c:137
+msgid "Customize the toolbars"
+msgstr ""
+
+#: src/mn-main-window.c:143
+msgid "_Preferences"
+msgstr ""
+
+#: src/mn-main-window.c:153
+msgid "Toolbars Styl_e"
+msgstr ""
+
+#: src/mn-main-window.c:155
+msgid "Customize the toolbars style"
+msgstr ""
+
+#: src/mn-main-window.c:163
+msgid "_Contents"
+msgstr ""
+
+#: src/mn-main-window.c:165
+#, fuzzy
+msgid "Display help"
+msgstr "Неуспех при показването на помощта"
+
+#: src/mn-main-window.c:171
+msgid "_About"
+msgstr ""
+
+#: src/mn-main-window.c:173
+msgid "Display credits"
+msgstr ""
+
+#: src/mn-main-window.c:185
+msgid "Show or hide the toolbars"
+msgstr ""
+
+#: src/mn-main-window.c:192
+msgid "_Statusbar"
+msgstr ""
+
+#: src/mn-main-window.c:194
+msgid "Show or hide the statusbar"
+msgstr ""
+
+#: src/mn-main-window.c:205
+msgid "_Desktop Default"
+msgstr ""
+
+#: src/mn-main-window.c:207
+msgid "Set the toolbars style to the desktop default setting"
+msgstr ""
+
+#: src/mn-main-window.c:213
+msgid "I_cons Only"
+msgstr ""
+
+#: src/mn-main-window.c:215
+msgid "Only display the toolbars icons"
+msgstr ""
+
+#: src/mn-main-window.c:221
+msgid "_Text Only"
+msgstr ""
+
+#: src/mn-main-window.c:223
+msgid "Only display the toolbars text"
+msgstr ""
+
+#: src/mn-main-window.c:229
+msgid "Text Belo_w Icons"
+msgstr ""
+
+#: src/mn-main-window.c:231
+msgid "Display the toolbars text below the icons"
+msgstr ""
+
+#: src/mn-main-window.c:237
+msgid "Text Be_side Icons"
+msgstr ""
+
+#: src/mn-main-window.c:239
+msgid "Display the toolbars text beside the icons"
+msgstr ""
+
+#: src/mn-main-window.c:363
+#, fuzzy, c-format
+msgid "unable to load menus.xml: %s"
+msgstr "грешка при отварянето на пощенската кутия: %s"
+
+#: src/mn-main-window.c:398
+msgid "Help messages"
+msgstr ""
+
+#: src/mn-main-window.c:399
+msgid "Count messages"
+msgstr ""
+
+#: src/mn-main-window.c:503
+#, c-format
+msgid "%i new message"
+msgid_plural "%i new messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/mn-main-window.c:540
+#, fuzzy
+msgid "unable to load toolbars.xml"
+msgstr "неуспех при затварянето на папката: %s"
+
 #: src/mn-main.c:99
 #, c-format
 msgid "Compiled-in mailbox backends: %s\n"
 msgstr ""
 
+#: src/mn-main.c:113
+msgid "Gmail timestamps"
+msgstr ""
+
 #: src/mn-main.c:116
 #, c-format
 msgid "Compiled-in features: %s\n"
 msgstr "Компилирани възможности: %s\n"
 
-#: src/mn-main.c:175
+#: src/mn-main.c:176
 msgid "Enable informational output"
 msgstr "Разрешаване на информационния изход"
 
-#: src/mn-main.c:184
-msgid "List compiled-in features and exit"
+#: src/mn-main.c:185
+#, fuzzy
+msgid "List the compiled-in features"
 msgstr "Изписване на компилираните възможности и излизане"
 
-#: src/mn-main.c:193
+#: src/mn-main.c:194
 #, fuzzy
-msgid "Display the mail summary dialog"
+msgid "Display the main window"
 msgstr "Изобразяване на диалоговия прозорец с информацията"
 
-#: src/mn-main.c:202
+#: src/mn-main.c:203
 msgid "Display the properties dialog"
 msgstr "Показване на диалоговия прозорец с настройките"
 
-#: src/mn-main.c:211
+#: src/mn-main.c:212
 msgid "Display the about dialog"
 msgstr "Изобразяване на диалоговия прозорец с информацията"
 
-#: src/mn-main.c:220
+#: src/mn-main.c:221
 msgid "Close the mail summary popup"
 msgstr ""
 
-#: src/mn-main.c:229
-msgid "Update the mail status"
-msgstr "Актуализиране състоянието на пощата"
-
-#: src/mn-main.c:238
+#: src/mn-main.c:239
 msgid "Report the mail status"
 msgstr "Докладване за състоянието на пощата"
 
-#: src/mn-main.c:247
-msgid "Unset obsolete GConf configuration and exit"
+#: src/mn-main.c:248
+#, fuzzy
+msgid "Unset obsolete GConf configuration"
 msgstr "Премахване на остарелите настройки в GConf и излизане"
 
 #.
 #. * We can't use mn_error_dialog() because gtk_init() has not been
 #. * called yet.
 #.
-#: src/mn-main.c:273
+#: src/mn-main.c:284
 msgid "multi-threading is not available"
 msgstr "много-нишки не е налично"
 
-#: src/mn-main.c:320
+#: src/mn-main.c:338
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
 msgstr ""
 
-#: src/mn-main.c:325
+#: src/mn-main.c:344
+#, fuzzy
+msgid "quitting Mail Notification"
+msgstr "Известяване за поща"
+
+#: src/mn-main.c:348
+#, fuzzy
+msgid "Mail Notification is not running"
+msgstr "Известяването за поща вече е стартирано"
+
+#: src/mn-main.c:355
 msgid "Unable to initialize the GnomeVFS library."
 msgstr "Неуспех при инициализирането на библиотеката GnomeVFS."
 
-#: src/mn-main.c:361
+#: src/mn-main.c:391
 msgid "updating the mail status"
 msgstr "актуализиране състоянието на пощата"
 
-#: src/mn-main.c:379
+#: src/mn-main.c:409
 msgid "Mail Notification is already running"
 msgstr "Известяването за поща вече е стартирано"
 
-#: src/mn-main.c:386
+#: src/mn-main.c:417
 msgid ""
 "Bonobo could not locate the GNOME_MailNotification_Automation.server file. "
 "Please check your Mail Notification installation."
 msgstr ""
 
-#: src/mn-main.c:390
+#: src/mn-main.c:421
 msgid ""
 "Bonobo was unable to register the automation server. Please check your Mail "
 "Notification installation."
@@ -1108,82 +1353,81 @@ msgstr ""
 "Bonobo не успя да регистрира сървъра за автоматизация. Моля, проверете "
 "инсталацията на известяването за поща."
 
-#: src/mn-mbox-mailbox.gob:221
-#, c-format
-msgid "error while reading mailbox: %s"
-msgstr "грешка при четенето на пощенската кутия: %s"
-
-#: src/mn-mbox-mailbox.gob:230
+#: src/mn-mbox-mailbox.gob:184
 #, c-format
 msgid "unable to open mailbox: %s"
 msgstr "грешка при отварянето на пощенската кутия: %s"
 
-#: src/mn-message-box.gob:64
+#: src/mn-message-mime.c:105
+#, fuzzy
+msgid "unable to parse MIME message"
+msgstr "неуспех при преглед на отговор \"%s\""
+
+#: src/mn-message-view.gob:81
+msgid "You have no new mail."
+msgstr "Нямата нова поща."
+
+#: src/mn-message-view.gob:321
 msgid "Unreadable message"
 msgstr ""
 
-#: src/mn-message-box.gob:69
+#: src/mn-message-view.gob:329
 msgid "From"
 msgstr ""
 
-#: src/mn-message-box.gob:70
+#: src/mn-message-view.gob:337
 msgid "Subject"
 msgstr ""
 
-#: src/mn-message-box.gob:75
+#: src/mn-message-view.gob:348
 msgid "Sent"
 msgstr ""
 
-#: src/mn-message-box.gob:192
+#: src/mn-message.gob:101
+msgid "Unknown"
+msgstr ""
+
+#: src/mn-message.gob:126
 #, c-format
 msgid "%i second ago"
 msgid_plural "%i seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-box.gob:196
+#: src/mn-message.gob:130
 #, c-format
-msgid "%i minute ago"
-msgid_plural "%i minutes ago"
+msgid "about %i minute ago"
+msgid_plural "about %i minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-box.gob:201
+#: src/mn-message.gob:135
 #, c-format
-msgid "%i hour ago"
-msgid_plural "%i hours ago"
+msgid "about %i hour ago"
+msgid_plural "about %i hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-box.gob:206
+#: src/mn-message.gob:140
 #, c-format
-msgid "%i day ago"
-msgid_plural "%i days ago"
+msgid "about %i day ago"
+msgid_plural "about %i days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-box.gob:211
+#: src/mn-message.gob:145
 #, c-format
-msgid "%i week ago"
-msgid_plural "%i weeks ago"
+msgid "about %i week ago"
+msgid_plural "about %i weeks ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-mime.c:105
-#, fuzzy
-msgid "unable to parse MIME message"
-msgstr "неуспех при преглед на отговор \"%s\""
-
-#: src/mn-message.gob:101
-msgid "Unknown"
-msgstr ""
-
-#: src/mn-mh-mailbox.gob:184
+#: src/mn-mh-mailbox.gob:147
 #, c-format
 msgid "error while reading .mh_sequences: %s"
 msgstr "грешка при четенето на .mh_sequences: %s"
 
-#: src/mn-mh-mailbox.gob:196
+#: src/mn-mh-mailbox.gob:157
 #, c-format
 msgid "unable to open .mh_sequences: %s"
 msgstr "неуспех при отварянето на .mh_sequences: %s"
@@ -1192,23 +1436,23 @@ msgstr "неуспех при отварянето на .mh_sequences: %s"
 msgid "detecting"
 msgstr "засичане"
 
-#: src/mn-pi-mailbox-properties.gob:76
+#: src/mn-pi-mailbox-properties.gob:75
 msgid "_Hostname:"
 msgstr "_Хост:"
 
-#: src/mn-pi-mailbox-properties.gob:94
+#: src/mn-pi-mailbox-properties.gob:93
 msgid "_Details"
 msgstr "_Подробности"
 
-#: src/mn-pi-mailbox-properties.gob:106
+#: src/mn-pi-mailbox-properties.gob:105
 msgid "sta_ndard"
 msgstr "стан_дартно"
 
-#: src/mn-pi-mailbox-properties.gob:116
+#: src/mn-pi-mailbox-properties.gob:115
 msgid "_in-band SSL/TLS"
 msgstr "_in-band SSL/TLS"
 
-#: src/mn-pi-mailbox-properties.gob:126
+#: src/mn-pi-mailbox-properties.gob:125
 msgid "SSL/TLS on sepa_rate port"
 msgstr "SSL/TLS на отделен по_рт"
 
@@ -1230,80 +1474,80 @@ msgstr ""
 msgid "The port number of the POP3 server"
 msgstr "Номера на порта на POP3 сървъра"
 
-#: src/mn-pop3-mailbox.gob:273
+#: src/mn-pop3-mailbox.gob:266
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr ""
 
-#: src/mn-pop3-mailbox.gob:590
+#: src/mn-pop3-mailbox.gob:569
 #, fuzzy
 msgid "unknown error"
 msgstr "неизвестна грешка в сървъра"
 
-#: src/mn-pop3-mailbox.gob:729
+#: src/mn-pop3-mailbox.gob:656
 #, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
 msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-pop3-mailbox.gob:893
+#: src/mn-pop3-mailbox.gob:849
 msgid "server does not support APOP authentication"
 msgstr "Сървърът не поддържа идентификация тип APOP"
 
-#: src/mn-pop3-mailbox.gob:922
+#: src/mn-pop3-mailbox.gob:884
 msgid "falling back to APOP authentication"
 msgstr ""
 
-#: src/mn-pop3-mailbox.gob:927
+#: src/mn-pop3-mailbox.gob:889
 msgid "falling back to USER/PASS authentication"
 msgstr ""
 
-#: src/mn-properties.c:193
+#: src/mn-properties-dialog.c:218
 #, fuzzy
 msgid "top left"
 msgstr "Завършено"
 
-#: src/mn-properties.c:194
+#: src/mn-properties-dialog.c:219
 msgid "top right"
 msgstr ""
 
-#: src/mn-properties.c:195
+#: src/mn-properties-dialog.c:220
 msgid "bottom left"
 msgstr ""
 
-#: src/mn-properties.c:196
+#: src/mn-properties-dialog.c:221
 msgid "bottom right"
 msgstr ""
 
-#: src/mn-properties.c:287
+#: src/mn-properties-dialog.c:323
 msgid "No mailbox selected."
 msgstr "Няма избрана кутия."
 
-#: src/mn-properties.c:292
+#: src/mn-properties-dialog.c:328
 #, fuzzy, c-format
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
 msgstr[0] "%i избрана кутия."
 msgstr[1] "%i избрана кутия."
 
-#: src/mn-shell.gob:93
+#: src/mn-shell.gob:96
 msgid "You have new mail."
 msgstr "Имате поща."
 
-#: src/mn-shell.gob:360
+#: src/mn-shell.gob:361
 msgid "Mailboxes Having New Mail"
 msgstr ""
 
-#: src/mn-shell.gob:362
+#: src/mn-shell.gob:382
 msgid "Errors"
 msgstr ""
 
-#: src/mn-shell.gob:364
+#: src/mn-shell.gob:403
 #, fuzzy
 msgid "Unsupported Mailboxes"
 msgstr "Системна кутия"
 
-#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:418
 msgid "Mail Summary"
 msgstr ""
 
@@ -1321,20 +1565,20 @@ msgid "Select _All"
 msgstr "Избор на _всички"
 
 #: src/mn-stock.c:29
-msgid "_Mail Summary"
+msgid "Leave Fullscreen"
 msgstr ""
 
-#: src/mn-sylpheed-mailbox.gob:119
+#: src/mn-sylpheed-mailbox.gob:113
 #, c-format
 msgid "unable to open folder: %s"
 msgstr "неуспех при отварянето на папката: %s"
 
-#: src/mn-sylpheed-mailbox.gob:165
+#: src/mn-sylpheed-mailbox.gob:147
 #, c-format
 msgid "unable to close folder: %s"
 msgstr "неуспех при затварянето на папката: %s"
 
-#: src/mn-sylpheed-mailbox.gob:168
+#: src/mn-sylpheed-mailbox.gob:150
 #, c-format
 msgid "error while reading folder: %s"
 msgstr "грешка при четенето на папката: %s"
@@ -1366,105 +1610,114 @@ msgstr "Причината защо пощенската кутия е непо
 msgid "unsupported"
 msgstr "не е поддържан"
 
-#: src/mn-util.c:233
+#: src/mn-util.c:245
 #, c-format
 msgid "error loading image: %s"
 msgstr "грешка при зареждането на изображение: %s"
 
-#: src/mn-util.c:271
+#: src/mn-util.c:276
 #, fuzzy, c-format
 msgid "widget \"%s\" not found in interface \"%s\""
 msgstr "уиджета %s не е намерен в интерфейса %s"
 
-#: src/mn-util.c:385
+#: src/mn-util.c:390
 msgid "received an invalid URI list"
 msgstr "получен е некоректен списък с адреси"
 
-#: src/mn-util.c:421
+#: src/mn-util.c:426
 msgid "received an invalid Mozilla URL"
 msgstr "получен е некоректен Mozilla адрес"
 
-#: src/mn-util.c:514
+#: src/mn-util.c:519
 msgid "Unable to display help"
 msgstr "Неуспех при показването на помощта"
 
-#: src/mn-util.c:528
+#: src/mn-util.c:533
 #, c-format
 msgid "Unable to create a thread: %s."
 msgstr "Неуспех при създаването на нишка: %s."
 
-#: src/mn-util.c:705
+#: src/mn-util.c:626
 msgid "_Do not show this message again"
 msgstr ""
 
-#: src/mn-util.c:789
+#: src/mn-util.c:710
 msgid "A fatal error has occurred in Mail Notification"
 msgstr "Получи се сериозна грешка в известяването за поща"
 
-#: src/mn-util.c:804
+#: src/mn-util.c:725
 #, fuzzy, c-format
 msgid "unable to get current time: %s"
 msgstr "неуспех при свързването с %s"
 
-#: src/mn-util.c:906
+#: src/mn-util.c:787
 #, c-format
 msgid "invalid signal specification \"%s\""
 msgstr ""
 
-#: src/mn-util.c:945
+#: src/mn-util.c:826
 msgid "A command error has occurred in Mail Notification"
 msgstr "Грешка с командите се получи в известяването за поща"
 
-#: src/mn-util.c:946
+#: src/mn-util.c:827
 #, fuzzy, c-format
 msgid "Unable to execute \"%s\": %s."
 msgstr "неуспех при намирането на %s: %s"
 
 #: ui/authentication.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ui/authentication.glade.h:2
 #, fuzzy
 msgid "_Authenticate"
 msgstr "Механизъм за _идентификация:"
 
+#: ui/edit-toolbars.glade.h:1
+msgid "Edit Toolbars"
+msgstr ""
+
+#: ui/edit-toolbars.glade.h:2
+msgid "_Add a New Toolbar"
+msgstr ""
+
+#: ui/edit-toolbars.glade.h:3
+msgid "_Use Default"
+msgstr ""
+
 #: ui/mailbox-properties.glade.h:1
 msgid "_Mailbox type:"
 msgstr "_Тип на пощенската кутия:"
 
 #: ui/properties.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: ui/properties.glade.h:2
 msgid "<span weight=\"bold\">Commands</span>"
 msgstr "<span weight=\"bold\">Команди</span>"
 
-#: ui/properties.glade.h:3
+#: ui/properties.glade.h:2
 #, fuzzy
 msgid "<span weight=\"bold\">Double-click Action</span>"
 msgstr "<span weight=\"bold\">Основни</span>"
 
-#: ui/properties.glade.h:4
+#: ui/properties.glade.h:3
 #, fuzzy
 msgid "<span weight=\"bold\">Fonts</span>"
 msgstr "<span weight=\"bold\">Команди</span>"
 
-#: ui/properties.glade.h:5
+#: ui/properties.glade.h:4
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Основни</span>"
 
-#: ui/properties.glade.h:6
+#: ui/properties.glade.h:5
 #, fuzzy
 msgid "<span weight=\"bold\">Mailbox List</span>"
 msgstr "<span weight=\"bold\">Пощенски кутии</span>"
 
-#: ui/properties.glade.h:7
+#: ui/properties.glade.h:6
 #, fuzzy
 msgid "<span weight=\"bold\">Position</span>"
 msgstr "<span weight=\"bold\">Команди</span>"
 
+#: ui/properties.glade.h:7
+#, fuzzy
+msgid "Co_ntents:"
+msgstr "Свъ_рзване"
+
 #: ui/properties.glade.h:8
 msgid "Dis_play mail summary in tooltip"
 msgstr ""
@@ -1535,109 +1788,105 @@ msgid ""
 msgstr ""
 
 #: ui/properties.glade.h:23
+msgid "Use these _fonts:"
+msgstr ""
+
+#: ui/properties.glade.h:24
 #, fuzzy
 msgid "When _all mail is read:"
 msgstr "При пристигане на _нова поща:"
 
-#: ui/properties.glade.h:24
+#: ui/properties.glade.h:25
 msgid "When _new mail arrives:"
 msgstr "При пристигане на _нова поща:"
 
-#: ui/properties.glade.h:25
+#: ui/properties.glade.h:26
 msgid "Whether the status icon should blink on errors or not"
 msgstr "Дали иконата за състоянието да започне да мига при грешки или не"
 
-#: ui/properties.glade.h:26
+#: ui/properties.glade.h:27
 #, fuzzy
 msgid "Whether to automatically close the mail summary popup or not"
 msgstr "Дали да се стартира команда при пристигането на нова поща или не"
 
-#: ui/properties.glade.h:27
+#: ui/properties.glade.h:28
 msgid "Whether to display the mail summary in the status icon tooltip or not"
 msgstr ""
 
-#: ui/properties.glade.h:28
+#: ui/properties.glade.h:29
 #, fuzzy
 msgid "Whether to display the mail summary popup when new mail arrives or not"
 msgstr "Дали да се стартира команда при пристигането на нова поща или не"
 
-#: ui/properties.glade.h:29
+#: ui/properties.glade.h:30
 msgid "Whether to hide previously displayed mail or not"
 msgstr ""
 
-#: ui/properties.glade.h:30
+#: ui/properties.glade.h:31
 #, fuzzy
 msgid "Whether to run a command when all mail is read or not"
 msgstr "Дали да се стартира команда при пристигането на нова поща или не"
 
-#: ui/properties.glade.h:31
+#: ui/properties.glade.h:32
 msgid "Whether to run a command when new mail arrives or not"
 msgstr "Дали да се стартира команда при пристигането на нова поща или не"
 
-#: ui/properties.glade.h:32
+#: ui/properties.glade.h:33
 #, fuzzy
 msgid "Whether to set a mail reader or not"
 msgstr "Дали да се стартира команда при пристигането на нова поща или не"
 
-#: ui/properties.glade.h:33
+#: ui/properties.glade.h:34
 msgid ""
 "Whether to start Mail Notification when you log into your GNOME session or "
 "not"
 msgstr ""
 "Дали да се стартира известяването за поща, когато влизате в GNOME или не"
 
-#: ui/properties.glade.h:34
-#, fuzzy
-msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
-"not"
-msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-
 #: ui/properties.glade.h:35
-#, fuzzy
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not"
-msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-
-#: ui/properties.glade.h:36
 msgid "_Automatically close after:"
 msgstr ""
 
-#: ui/properties.glade.h:37
+#: ui/properties.glade.h:36
 msgid "_Blink on errors"
 msgstr "_Мигане при грешки"
 
-#: ui/properties.glade.h:38
-msgid "_Contents font:"
-msgstr ""
-
-#: ui/properties.glade.h:39
+#: ui/properties.glade.h:37
 msgid "_Delay between mail checks:"
 msgstr "_Време между проверките за поща:"
 
-#: ui/properties.glade.h:40
+#: ui/properties.glade.h:38
 #, fuzzy
-msgid "_Display the mail summary dialog"
+msgid "_Display the main window"
 msgstr "Изобразяване на диалоговия прозорец с информацията"
 
-#: ui/properties.glade.h:41
+#: ui/properties.glade.h:39
 msgid "_Enable mail summary popup"
 msgstr ""
 
-#: ui/properties.glade.h:42
+#: ui/properties.glade.h:40
 msgid "_Launch the mail reader"
 msgstr ""
 
-#: ui/properties.glade.h:43
+#: ui/properties.glade.h:41
 msgid "_Mail reader:"
 msgstr ""
 
-#: ui/properties.glade.h:44
+#: ui/properties.glade.h:42
 msgid "_Start Mail Notification on GNOME login"
 msgstr "_Стартиране на известяването за поща при влизане в GNOME"
 
+#: ui/properties.glade.h:43
+msgid "_Title:"
+msgstr ""
+
+#: ui/properties.glade.h:44
+#, fuzzy
+msgid "_Update the mail status"
+msgstr "Актуализиране състоянието на пощата"
+
 #: ui/properties.glade.h:45
-msgid "_Title font:"
+msgid "_Use fonts from theme"
 msgstr ""
 
 #: ui/properties.glade.h:46
@@ -1662,12 +1911,13 @@ msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
 msgstr "<span weight=\"bold\">Пощенски кутии</span>"
 
 #: ui/welcome.glade.h:1
+#, fuzzy
 msgid ""
 "<span weight=\"bold\" size=\"larger\">First startup</span>\n"
 "\n"
 "Mail Notification has been loaded successfully.\n"
 "\n"
-"Since this is the first time you run Mail Notification, you might want to "
+"Since this is the first time you run Mail Notification, you need to "
 "configure it.\n"
 "\n"
 "Note: this message will not be shown anymore. To configure Mail Notification "
@@ -1723,6 +1973,12 @@ msgstr "_Пропускане на настройването"
 #~ msgid "_Run Default Action"
 #~ msgstr "_Стартиране на стандартното действие"
 
+#~ msgid "%s has no new mail"
+#~ msgstr "%s няма нова поща"
+
+#~ msgid "error while reading mailbox: %s"
+#~ msgstr "грешка при четенето на пощенската кутия: %s"
+
 #~ msgid "Your password on the POP3 server"
 #~ msgstr "Паролата ви в POP3 сървъра"
 
@@ -1735,9 +1991,6 @@ msgstr "_Пропускане на настройването"
 #~ msgid "The following mailbox has new mail:\n"
 #~ msgstr "Следната пощенска кутия има нова поща:\n"
 
-#~ msgid "You have no new mail."
-#~ msgstr "Нямата нова поща."
-
 #~ msgid "The following mailbox reported an error:\n"
 #~ msgstr "Следната пощенска кутия докладва за грешка:\n"
 
@@ -1747,6 +2000,12 @@ msgstr "_Пропускане на настройването"
 #~ msgid "Unable to execute new mail command: %s."
 #~ msgstr "Неуспех при стартирането на нова пощенска команда: %s."
 
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "*"
+#~ msgstr "*"
+
 #~ msgid "The command to run when the icon is double-clicked"
 #~ msgstr ""
 #~ "Командата, която да се стартира когато иконата-писмо се натисне два пъти"
diff --git a/po/de.gmo b/po/de.gmo
Binary files differ.
diff --git a/po/de.po b/po/de.po
@@ -1,18 +1,18 @@
 # German translations for mail-notification.
-# Copyright (c) 2003, 2004 Jean-Yves Lefort.
+# Copyright (C) 2003-2005 Jean-Yves Lefort.
 #
 # This file is distributed under the same license as the
 # mail-notification package.
 #
-# Hendrik Brandt <eru@gmx.li>, 2004.
+# Hendrik Brandt <heb@gnome-de.org>, 2004-2005.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 1.0\n"
+"Project-Id-Version: mail-notification 1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-25 01:43+0100\n"
-"PO-Revision-Date: 2004-11-21 17:14+0100\n"
-"Last-Translator: Hendrik Brandt <eru@gmx.li>\n"
+"POT-Creation-Date: 2005-03-02 02:32+0100\n"
+"PO-Revision-Date: 2005-03-02 21:38+0100\n"
+"Last-Translator: Hendrik Brandt <heb@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,14 +27,14 @@ msgstr "Automatische E-Mail-Eingangsüberwachnung"
 msgid "Mail Notification automation factory"
 msgstr "Automatische E-Mail-Eingangsüberwachnung"
 
-#: data/mail-notification-properties.desktop.in.h:1
+#: data/mail-notification-properties.desktop.in.h:1 src/mn-main-window.c:145
 msgid "Configure Mail Notification"
 msgstr "Die E-Mail-Eingangsüberwachung einstellen"
 
 #: data/mail-notification-properties.desktop.in.h:2
 #: data/mail-notification.desktop.in.h:2
-#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:40
-#: src/mn-mail-icon.gob:194 src/mn-main.c:281
+#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:39
+#: src/mn-mail-icon.gob:224 src/mn-main.c:292 ui/main.glade.h:1
 msgid "Mail Notification"
 msgstr "E-Mail-Eingangsüberwachung"
 
@@ -83,137 +83,158 @@ msgid "Has already been run"
 msgstr "Wurde schon einmal gestartet"
 
 #: data/mail-notification.schemas.in.h:11
-msgid "Height of mail summary dialog"
-msgstr "Höhe der Nachrichtenübersicht"
+msgid "Height of edit toolbars dialog"
+msgstr "Höhe des Dialogs zum Bearbeiten der Werkzeugleisten"
 
 #: data/mail-notification.schemas.in.h:12
+msgid "Height of main window"
+msgstr "Höhe des Hauptfensters"
+
+#: data/mail-notification.schemas.in.h:13
 msgid "Height of properties dialog"
 msgstr "Höhe des Einstellungen-Dialogs"
 
-#: data/mail-notification.schemas.in.h:13
+#: data/mail-notification.schemas.in.h:14
 msgid "Mail read command"
 msgstr "Befehl zum Lesen einer Nachricht"
 
-#: data/mail-notification.schemas.in.h:14
+#: data/mail-notification.schemas.in.h:15
 msgid "Mail reader command"
 msgstr "Befehl zum Starten des E-Mail-Programms"
 
-#: data/mail-notification.schemas.in.h:15
+#: data/mail-notification.schemas.in.h:16
 msgid "Mail summary popup contents font"
 msgstr "Schrift für den Inhalt der Nachrichtenübersicht"
 
-#: data/mail-notification.schemas.in.h:16
+#: data/mail-notification.schemas.in.h:17
+msgid "Mail summary popup fonts aspect source"
+msgstr "Quelle der Schrift für die Nachrichtenübersicht"
+
+#: data/mail-notification.schemas.in.h:18
 msgid "Mail summary popup horizontal offset"
 msgstr "Horizontaler Abstand der Nachrichtenübersicht"
 
-#: data/mail-notification.schemas.in.h:17
+#: data/mail-notification.schemas.in.h:19
 msgid "Mail summary popup position"
 msgstr "Position der Nachrichtenübersicht"
 
-#: data/mail-notification.schemas.in.h:18
+#: data/mail-notification.schemas.in.h:20
 msgid "Mail summary popup title font"
 msgstr "Schrift für den Titel der Nachrichtenübersicht"
 
-#: data/mail-notification.schemas.in.h:19
+#: data/mail-notification.schemas.in.h:21
 msgid "Mail summary popup vertical offset"
 msgstr "Vertikaler"
 
-#: data/mail-notification.schemas.in.h:20
+#: data/mail-notification.schemas.in.h:22
 msgid "Mailbox list"
 msgstr "Liste der Postfächer"
 
-#: data/mail-notification.schemas.in.h:21
+#: data/mail-notification.schemas.in.h:23
 msgid "Minutes between mail checks"
 msgstr "Minuten zwischen den Aktualisierungen"
 
-#: data/mail-notification.schemas.in.h:22
+#: data/mail-notification.schemas.in.h:24
 msgid "Minutes to wait before closing the mail summary popup"
 msgstr "Wartezeit bis zum Schließen der Nachrichtenübersicht"
 
-#: data/mail-notification.schemas.in.h:23
+#: data/mail-notification.schemas.in.h:25
 msgid "New mail command"
 msgstr "Befehl bei neuer Nachricht"
 
-#: data/mail-notification.schemas.in.h:24
+#: data/mail-notification.schemas.in.h:26
 msgid "Only display recent mail in mail summary popup"
 msgstr "Nur aktuelle Nachrichten in der Nachrichtenübersicht anzeigen"
 
-#: data/mail-notification.schemas.in.h:25
+#: data/mail-notification.schemas.in.h:27
 msgid "Run a command when all mail is read"
 msgstr "Einen Befehl ausführen, wenn alle Nachrichten gelesen sind"
 
-#: data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:28
 msgid "Run a command when new mail arrives"
 msgstr "Einen Befehl ausführen, wenn eine neue Nachricht eintrifft"
 
-#: data/mail-notification.schemas.in.h:27
+#: data/mail-notification.schemas.in.h:29
 msgid "Seconds between mail checks"
 msgstr "Sekunden zwischen den Aktualisierungen"
 
-#: data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:30
 msgid "Seconds to wait before closing the mail summary popup"
 msgstr "Wartezeit in Sekunden bis zum Schließen der Nachrichtenübersicht"
 
-#: data/mail-notification.schemas.in.h:29
+#: data/mail-notification.schemas.in.h:31
 msgid "Set a mail reader"
 msgstr "Ein E-Mail-Programm festlegen"
 
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:32
 msgid ""
 "The action to perform when the icon is double-clicked. Must be \"display-"
-"mail-summary\" or \"launch-mail-reader\"."
+"main-window\", \"launch-mail-reader\" or \"update-mail-status\"."
 msgstr ""
 "Die auszuführende Aktion wenn das Symbol doppelt angeklickt wird. Hat "
-"entweder den Wert »display-mail-summary« oder »launch-mail-reader«."
+"entweder den Wert »display-mail-window«, »launch-mail-reader« oder  »update-"
+"mail-status«."
 
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:33
 msgid ""
 "The amount of time to wait before closing the mail summary popup (minutes "
 "part)."
 msgstr ""
 "Die Zeitspanne bis zum Schließen der Nachrichtenübersicht (Minutenteil)."
 
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:34
 msgid ""
 "The amount of time to wait before closing the mail summary popup (seconds "
 "part)."
 msgstr ""
 "Die Zeitspanne bis zum Schließen der Nachrichtenübersicht (Sekundenteil)."
 
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:35
+msgid ""
+"The aspect source of the mail summary popup fonts. Must be \"theme\" or "
+"\"custom\"."
+msgstr ""
+"Die Quelle aus der die Schrift für die Nachrichtenübersicht festgelegt wird. "
+"Der Wert muss entweder »theme« oder »custom« sein."
+
+#: data/mail-notification.schemas.in.h:36
 msgid "The command to run to launch the mail reader."
 msgstr "Der Befehl um das E-Mail-Programm zu starten"
 
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:37
 msgid "The command to run when all mail is read."
 msgstr "Der Befehl der ausgeführt wird, wenn alle Nachrichten gelesen wurden"
 
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:38
 msgid "The command to run when new mail arrives."
 msgstr "Der Befehl der ausgeführt wird, wenn eine neue Nachricht eintrifft."
 
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:39
 msgid "The custom font to use for the contents of the mail summary popup."
 msgstr ""
 "Die benutzerdefinierte Schrift für den Inhalt der Nachrichtenübersicht."
 
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:40
 msgid "The custom font to use for the title of the mail summary popup."
 msgstr "Die benutzerdefinierte Schrift für den Titel der Nachrichtenübersicht."
 
-#: data/mail-notification.schemas.in.h:38
-msgid "The height of the mail summary dialog in pixels."
-msgstr "Die Höhe der Nachrichtenübersicht in Pixel."
+#: data/mail-notification.schemas.in.h:41
+msgid "The height of the edit toolbars dialog in pixels."
+msgstr "Die Höhe des Dialogs zum Bearbeiten der Werkzeugleisten in Pixel."
 
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:42
+msgid "The height of the main window in pixels."
+msgstr "Die Höhe des Hauptfensters in Pixel."
+
+#: data/mail-notification.schemas.in.h:43
 msgid "The height of the properties dialog in pixels."
 msgstr "Die Höhe des Einstellungsdialogs in Pixel."
 
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:44
 msgid "The list of mailboxes to monitor."
 msgstr "Die Liste der zu überwachenden Postfächer."
 
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:45
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
@@ -221,14 +242,14 @@ msgstr ""
 "Die Liste vertrauensvoller SSL/TLS-Server (Host-Name:Port) ohne X509-"
 "Zertifikat."
 
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:46
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
 msgstr ""
 "Die Liste vertrauensvoller X509-Zertifikate, repräsentiert durch ihre MD5-"
 "Fingerabdrücke."
 
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:47
 msgid ""
 "The number of pixels to leave between the left or right side of the screen "
 "and the mail summary popup."
@@ -236,7 +257,7 @@ msgstr ""
 "Die Anzahl an Pixeln die zwischen dem linken oder rechten Bildschirmrand und "
 "der Nachrichtenübersicht."
 
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:48
 msgid ""
 "The number of pixels to leave between the top or bottom side of the screen "
 "and the mail summary popup."
@@ -244,7 +265,7 @@ msgstr ""
 "Die Anzahl an Pixeln die zwischen dem oberen oder runteren Bildschirmrand "
 "und der Nachrichtenübersicht."
 
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:49
 msgid ""
 "The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
 "\"bottom-left\" or \"bottom-right\"."
@@ -252,106 +273,115 @@ msgstr ""
 "Die Position der Nachrichtenübersicht. Der Wert muss »oben-links«, »oben-"
 "rechts«, »unten-links« oder »unten-rechts« sein."
 
-#: data/mail-notification.schemas.in.h:46
-msgid "The width of the mail summary dialog in pixels."
-msgstr "Die Breite der Nachrichtenübersicht in Pixel."
+#: data/mail-notification.schemas.in.h:50
+msgid ""
+"The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text\", "
+"\"both\" or \"both-horiz\"."
+msgstr ""
+"Der Werkzeugleistenmodus. Muss den Wert »desktop-default«, »icons«, »text«, "
+"»both« oder »both-horiz« haben."
 
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:51
+msgid "The width of the edit toolbars dialog in pixels."
+msgstr "Die Breite des Werkzeugleistenbearbeitungsdialogs in Pixel."
+
+#: data/mail-notification.schemas.in.h:52
+msgid "The width of the main window in pixels."
+msgstr "Die Breite des Hauptfensters in Pixel."
+
+#: data/mail-notification.schemas.in.h:53
 msgid "The width of the properties dialog in pixels."
 msgstr "Die Breite des Einstellungen-Dialogs in Pixel."
 
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:54
+msgid "Toolbars style"
+msgstr "Werkzeugleistenmodus"
+
+#: data/mail-notification.schemas.in.h:55
 msgid "Trusted servers list"
 msgstr "Liste vertrauensvoller Server"
 
-#: data/mail-notification.schemas.in.h:49
-msgid "Use a custom font for the contents of the mail summary popup"
-msgstr ""
-"Eine benutzerdefinierte Schrift für den Inhalt der Nachrichtenübersicht "
-"verwenden"
+#: data/mail-notification.schemas.in.h:56
+msgid "View statusbar"
+msgstr "Statusleiste anzeigen"
 
-#: data/mail-notification.schemas.in.h:50
-msgid "Use a custom font for the title of the mail summary popup"
-msgstr ""
-"Eine benutzerdefinierte Schrift für den Titel der Nachrichtenübersicht "
-"verwenden"
+#: data/mail-notification.schemas.in.h:57
+msgid "View toolbars"
+msgstr "Werkzeugleisten anzeigen"
 
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:58
 msgid "Whether Mail Notification has already been run or not."
 msgstr ""
 "Legt fest, ob die E-Mail-Eingangsüberwachnung schon einmal gestartet wurde."
 
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:59
 msgid "Whether the status icon should blink on errors or not."
 msgstr ""
 "Legt fest, ob das  Nachrichtensymbol bei Auftreten eines Fehlers blinkt."
 
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:60
+msgid "Whether the statusbar should be visible or not."
+msgstr "Legt fest, ob die Statusleiste angezeigt werden."
+
+#: data/mail-notification.schemas.in.h:61
+msgid "Whether the toolbars should be visible or not."
+msgstr "Legt fest, ob die Werkzeugleisten angezeigt werden."
+
+#: data/mail-notification.schemas.in.h:62
 msgid "Whether to automatically close the mail summary popup or not."
 msgstr ""
 "Legt fest, ob ein Befehl ausgeführt wird, wenn eine neue Nachricht eintrifft."
 
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:63
 msgid "Whether to display the mail summary in the status icon tooltip or not."
 msgstr ""
 "Legt fest, ob die Nachrichtenübersicht in der Minihilfe des Statussymbols "
 "angezeigt wird."
 
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:64
 msgid "Whether to display the mail summary popup when new mail arrives or not."
 msgstr ""
 "Legt fest, ob die Nachrichtenübersicht angezeigt wird, wenn eine neue "
 "Nachricht eintrifft."
 
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:65
 msgid ""
 "Whether to hide previously displayed mail in the mail summary popup or not."
 msgstr ""
 "Legt fest, ob zuvor angezeigte Nachrichten in der Nachrichtenübersicht "
 "erneut angezeigt werden."
 
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:66
 msgid ""
 "Whether to prevent the immediate notification error dialog from being "
 "displayed or not."
 msgstr ""
 "Legt fest, ob der Fehlerdialog der Sofortbenachrichtigung angezeigt wird."
 
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:67
 msgid "Whether to run a command when all mail is read or not."
 msgstr ""
 "Legt fest, ob ein Befehl ausgeführt wird, wenn alle Nachrichten gelesen "
 "wurden."
 
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:68
 msgid "Whether to run a command when new mail arrives or not."
 msgstr ""
 "Legt fest, ob ein Befehl ausgeführt wird, wenn eine neue Nachricht eintrifft."
 
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:69
 msgid "Whether to set a mail reader or not."
 msgstr "Legt fest, ob ein E-Mail-Programm ausgewählt ist."
 
-#: data/mail-notification.schemas.in.h:61
-msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
-"not."
-msgstr ""
-"Legt fest, ob für den Inhalt der Nachrichtenübersicht eine eigene Schrift "
-"verwendet werden soll."
-
-#: data/mail-notification.schemas.in.h:62
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not."
-msgstr ""
-"Legt fest, ob für den Titel der Nachrichtenübersicht eine eigene Schrift "
-"verwendet werden soll."
+#: data/mail-notification.schemas.in.h:70
+msgid "Width of edit toolbars dialog"
+msgstr "Breite des Werkzeugleistenbearbeitungsdialogs"
 
-#: data/mail-notification.schemas.in.h:63
-msgid "Width of mail summary dialog"
-msgstr "Breite der Nachrichtenübersicht"
+#: data/mail-notification.schemas.in.h:71
+msgid "Width of main window"
+msgstr "Breite des Hauptfensters"
 
-#: data/mail-notification.schemas.in.h:64
+#: data/mail-notification.schemas.in.h:72
 msgid "Width of properties dialog"
 msgstr "Breite des Einstellungen-Dialogs"
 
@@ -359,6 +389,23 @@ msgstr "Breite des Einstellungen-Dialogs"
 msgid "New Mail"
 msgstr "Neue Nachricht"
 
+#: src/egg-editable-toolbar.c:536
+msgid "_Remove Toolbar"
+msgstr "Werkzeugleiste _entfernen"
+
+#: src/egg-toolbar-editor.c:558
+msgid "Separator"
+msgstr "Trennlinie"
+
+#: src/egg-toolbar-editor.c:588
+msgid ""
+"Drag an item onto the toolbars above to add it, from the toolbars in the "
+"items table to remove it."
+msgstr ""
+"Ziehen Sie einen Eintrag auf die Werkzeugleiste, um diesen hinzu zufügen "
+"oder ziehen Sie einen Eintrag von der Werkzeugleiste in das Depot um diesen "
+"zu entfernen."
+
 #: src/eggtrayicon.c:109
 msgid "Orientation"
 msgstr "Ausrichtung"
@@ -367,22 +414,22 @@ msgstr "Ausrichtung"
 msgid "The orientation of the tray."
 msgstr "Die Ausrichtung des Benachrichtigungsfeldes"
 
-#: src/mn-about-dialog.gob:43
+#: src/mn-about-dialog.gob:42
 msgid "A Mail Notification Icon"
 msgstr ""
 "Ein Benachrichtigungssymbol das erscheint, wenn neue Nachrichten in Ihren "
 "Postfächern liegen."
 
 #. translator: replace with your name and email
-#: src/mn-about-dialog.gob:47
+#: src/mn-about-dialog.gob:46
 msgid "Jean-Yves Lefort <jylefort@brutele.be>"
 msgstr "Hendrik Brandt <eru@gmx.li>"
 
-#: src/mn-auth-combo-box.gob:101 src/mn-autodetect-mailbox-properties.gob:37
+#: src/mn-auth-combo-box.gob:102 src/mn-autodetect-mailbox-properties.gob:39
 msgid "<span style=\"italic\">autodetect</span>"
 msgstr "<span style=\"italic\">automatisch erkennen</span>"
 
-#: src/mn-authenticated-mailbox.gob:80
+#: src/mn-authenticated-mailbox.gob:85
 #, c-format
 msgid ""
 "Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -396,12 +443,12 @@ msgstr ""
 "\n"
 "Bitte geben Sie das Passwort für dieses Postfach ein."
 
-#: src/mn-authenticated-mailbox.gob:81
+#: src/mn-authenticated-mailbox.gob:86
 #, c-format
 msgid "Enter your password for %s mailbox %s."
 msgstr "Bitte geben Sie das Passwort für %s-Postfach »%s«."
 
-#: src/mn-authenticated-mailbox.gob:132
+#: src/mn-authenticated-mailbox.gob:137
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Mail Notification requires a password</"
@@ -414,11 +461,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mn-autodetect-mailbox-properties.gob:68
+#: src/mn-autodetect-mailbox-properties.gob:70
 msgid "_Location:"
 msgstr "_Ort:"
 
-#: src/mn-autodetect-mailbox-properties.gob:74
+#: src/mn-autodetect-mailbox-properties.gob:76
 msgid "_Browse..."
 msgstr "_Durchsuchen..."
 
@@ -426,7 +473,7 @@ msgstr "_Durchsuchen..."
 msgid "The URI of the mailbox"
 msgstr "Die Adresse des Postfachs"
 
-#: src/mn-autodetect-mailbox-properties.gob:118
+#: src/mn-autodetect-mailbox-properties.gob:123
 msgid "Select a File or Folder"
 msgstr "Wählen Sie eine Datei oder ein Verzeichnis"
 
@@ -563,82 +610,81 @@ msgstr "Es konnte nicht vom Server gelesen werden: EOF"
 msgid "unable to decode data using SASL: %s"
 msgstr "Die Daten konnten nicht per SASL dekodiert werden: %s"
 
-#: src/mn-client-session.c:746
+#: src/mn-client-session.c:743
 #, c-format
 msgid "unable to encode data using SASL: %s"
 msgstr "Die Daten konnten nicht per SASL kodiert werden: %s"
 
-#: src/mn-client-session.c:777 src/mn-client-session.c:784
+#: src/mn-client-session.c:774 src/mn-client-session.c:781
 #, c-format
 msgid "unable to write to server: %s"
 msgstr "Es konnte nicht auf den Server geschrieben werden: %s"
 
-#: src/mn-client-session.c:782
+#: src/mn-client-session.c:779
 msgid "unable to write to server: EOF"
 msgstr "Es konnte nicht auf den Server geschrieben werden: EOF"
 
-#: src/mn-client-session.c:814
+#: src/mn-client-session.c:811
 #, c-format
 msgid "unable to encode Base64: %s"
 msgstr "Es konnte nicht mit Base64 kodiert werden: %s"
 
-#: src/mn-client-session.c:925
+#: src/mn-client-session.c:922
 #, c-format
 msgid "unable to initialize the SASL library: %s"
 msgstr "Die SASL-Bibliothek konnte nicht initializiert werden: %s"
 
-#: src/mn-client-session.c:934
+#: src/mn-client-session.c:931
 #, c-format
 msgid "unable to retrieve local address of socket: %s"
 msgstr "Die lokale Adresse des Socket konnte nicht herausgefunden werden: %s"
 
-#: src/mn-client-session.c:940
+#: src/mn-client-session.c:937
 #, c-format
 msgid "unable to retrieve remote address of socket: %s"
 msgstr ""
 "Die entfernte Adresse des Socket konnte nicht herausgefunden werden: %s"
 
-#: src/mn-client-session.c:974
+#: src/mn-client-session.c:971
 #, c-format
-msgid "warning: unable to set SASL security properties: %s"
-msgstr ""
-"Warnung: Die SASL-Sicherheitseigenschaften konnten nicht gesetzt werden: %s"
+msgid "unable to set SASL security properties: %s"
+msgstr "die SASL-Sicherheitseigenschaften konnten nicht gesetzt werden: %s"
 
-#: src/mn-client-session.c:998
+#: src/mn-client-session.c:995
 msgid ""
 "unable to start SASL authentication: SASL asked for something we did not know"
 msgstr ""
 "Die SASL-Authentifizierung konnte nicht gestartet werden: es wurde eine "
 "unbekannte Anfrage von SASL gestellt"
 
-#: src/mn-client-session.c:1017
+#: src/mn-client-session.c:1014
 #, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr "Die SASL-Authentifizierung konnte nicht gestartet werden: %s"
 
-#: src/mn-client-session.c:1021
+#: src/mn-client-session.c:1018
 #, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr "Es konnte keine Verbindung mit SASL erzeugt werden: %s"
 
-#: src/mn-client-session.c:1058
+#: src/mn-client-session.c:1055
 msgid "SASL asked for something we did not know, aborting SASL authentication"
 msgstr ""
 "Es wurde eine unbekannte Anfrage von SASL gestellt, SASL-Authentifizierung "
 "wird abgebrochen"
 
-#: src/mn-client-session.c:1075
+#: src/mn-client-session.c:1072
 #, c-format
 msgid "%s, aborting SASL authentication"
 msgstr "%s, SASL-Authentifizierung wird abgebrochen"
 
 #. compliance error
-#: src/mn-client-session.c:1080
+#: src/mn-client-session.c:1077
 #, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr "Die Server-seitige Base64-Eingabe konnte nicht dekodiert werden: %s"
 
-#: src/mn-client-session.c:1083
+#: src/mn-client-session.c:1080
 msgid ""
 "the server sent a SASL challenge, but there was a pending initial SASL "
 "client response"
@@ -646,7 +692,7 @@ msgstr ""
 "Der Server hat während einer beginnenden SASL-Client-Antwort einen Fehler "
 "gesendet"
 
-#: src/mn-client-session.c:1097
+#: src/mn-client-session.c:1094
 msgid ""
 "the server did not send a SASL challenge, but there was no pending initial "
 "SASL client response"
@@ -654,40 +700,49 @@ msgstr ""
 "Der Server hat kein SASL-Problem gesendet, während noch eine Client-seitige "
 "SASL-Reaktion begonnen wurde"
 
-#: src/mn-client-session.c:1122
+#: src/mn-client-session.c:1119
 #, c-format
 msgid "a SASL security layer of strength factor %i is now active"
 msgstr "Die SASL-Sicherheitsebene der Stärke %i ist jetzt aktiv"
 
 #. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: src/mn-client-session.c:1127
+#: src/mn-client-session.c:1124
 #, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr "Der Wert SASL_MAXOUTBUF wurde nicht gefunden: %s"
 
-#: src/mn-client-session.c:1133
+#: src/mn-client-session.c:1130
 #, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr "Warnung: Der Wert SASL_SSF wurde nicht gefunden: %s"
 
-#: src/mn-conf.c:145
+#: src/mn-conf.c:238
+msgid "A directory creation error has occurred"
+msgstr "Beim Verzeichniserstellen ist ein Fehler aufgetreten"
+
+#: src/mn-conf.c:239
+#, c-format
+msgid "Unable to create directory \"%s\": %s."
+msgstr "Das Verzeichnis»%s« konnte nicht angelegt werden: %s."
+
+#: src/mn-conf.c:313
 #, c-format
 msgid "recursively unsetting %s"
 msgstr "%s rekursiv zurück setzen"
 
-#: src/mn-conf.c:149
+#: src/mn-conf.c:317
 msgid "syncing the GConf database"
 msgstr "Synchronisiere mit der GConf-Datenbank"
 
-#: src/mn-conf.c:152
+#: src/mn-conf.c:320
 msgid "completed"
 msgstr "Abgeschlossen"
 
-#: src/mn-gmail-mailbox-properties.gob:77
+#: src/mn-gmail-mailbox-properties.gob:76
 msgid "Your Gmail username"
 msgstr "Ihr Gmail-Benutzername"
 
-#: src/mn-gmail-mailbox-properties.gob:78
+#: src/mn-gmail-mailbox-properties.gob:77
 msgid ""
 "Your Gmail password (if left blank, you will be prompted for the password "
 "when needed)"
@@ -695,36 +750,59 @@ msgstr ""
 "Ihr Gmail-Passwort (falls Sie nichts eingeben, werden Sie jedesmal wenn es "
 "notwendig ist nach dem Passwort gefragt)"
 
-#: src/mn-gmail-mailbox.gob:82
+#: src/mn-gmail-mailbox.gob:86
 msgid "libsoup has not been compiled with SSL/TLS support"
 msgstr "»libsoup« wurde nicht mit SSL/TLS-Unterstützung erstellt"
 
-#: src/mn-gmail-mailbox.gob:160
+#: src/mn-gmail-mailbox.gob:164
 #, c-format
 msgid "unable to parse URI \"%s\""
 msgstr "Die Adresse »%s« konnte nicht analysiert werden"
 
-#: src/mn-gmail-mailbox.gob:214
+#: src/mn-gmail-mailbox.gob:217
+msgid "received non-UTF-8 data from server"
+msgstr "Vom Server wurden nicht-UTF-8-Daten übermittelt"
+
+#: src/mn-gmail-mailbox.gob:224
 #, c-format
 msgid "unable to transfer data: %s"
 msgstr "Daten konnten nicht übertragen werden: %s"
 
-#: src/mn-gmail-mailbox.gob:335
+#: src/mn-gmail-mailbox.gob:345
 msgid "logging in"
 msgstr "Anmelden bei"
 
-#: src/mn-gmail-mailbox.gob:413
+#: src/mn-gmail-mailbox.gob:423
 msgid "login failed"
 msgstr "Anmeldung fehlgeschlagen"
 
-#: src/mn-gmail-mailbox.gob:488
+#: src/mn-gmail-mailbox.gob:496
 msgid "searching for unread mail"
 msgstr "Es wird nach ungelesenen Nachrichten gesucht"
 
 #: src/mn-gmail-mailbox.gob:527
+msgid "unable to initialize the ICU library"
+msgstr "Die ICU-Bibliothek konnte nicht initializiert werden"
+
+#: src/mn-gmail-mailbox.gob:554
 msgid "unable to parse Gmail data"
 msgstr "Die Gmail-Daten konnte nicht analysiert werden"
 
+#: src/mn-gmail-mailbox.gob:891
+#, c-format
+msgid "unable to open calendar: %s"
+msgstr "Kalender konnte nicht geöffnet werden: %s"
+
+#: src/mn-gmail-mailbox.gob:899
+#, c-format
+msgid "unable to set calendar time: %s"
+msgstr "Die Kalenderzeit konnte nicht gesetzt werden: %s"
+
+#: src/mn-gmail-mailbox.gob:968
+#, c-format
+msgid "unable to get calendar time: %s"
+msgstr "Die aktuelle Kalenderzeit konnte nicht ermittelt werden: %s"
+
 #: src/mn-gmime-stream-vfs.gob:49
 #, c-format
 msgid "unable to read %s: %s"
@@ -750,19 +828,19 @@ msgstr "Die Position von %s konnte nicht ermittelt werden: %s"
 msgid "unable to close %s: %s"
 msgstr "%s konnte nicht geschlossen werden: %s"
 
-#: src/mn-imap-mailbox-properties.gob:94
+#: src/mn-imap-mailbox-properties.gob:95
 msgid "Mailbox:"
 msgstr "Postfach:"
 
-#: src/mn-imap-mailbox-properties.gob:98
+#: src/mn-imap-mailbox-properties.gob:99
 msgid "in_box"
 msgstr "In_box"
 
-#: src/mn-imap-mailbox-properties.gob:109
+#: src/mn-imap-mailbox-properties.gob:110
 msgid "oth_er:"
 msgstr "_Anderer:"
 
-#: src/mn-imap-mailbox-properties.gob:121
+#: src/mn-imap-mailbox-properties.gob:122
 msgid "U_se idle mode if possible"
 msgstr "Wenn möglich Leerlauf_modus verwenden"
 
@@ -795,54 +873,49 @@ msgstr "Der Postfachname"
 msgid "If possible, whether to use idle mode or not"
 msgstr "Wenn möglich wird der Leerlauf_modus verwenden"
 
-#: src/mn-imap-mailbox.gob:166 src/mn-pop3-mailbox.gob:143
+#: src/mn-imap-mailbox.gob:156 src/mn-pop3-mailbox.gob:136
 msgid "SSL/TLS support has not been compiled in"
 msgstr ""
 "Die Unterstützung für SSL/TLS wurde beim Erstellen des Programms nicht "
 "eingebaut"
 
-#: src/mn-imap-mailbox.gob:246
+#: src/mn-imap-mailbox.gob:236
 msgid "server did not send capabilities"
 msgstr "Der Server hat seine Fähigkeiten nicht bekannt gegeben"
 
-#: src/mn-imap-mailbox.gob:418
+#: src/mn-imap-mailbox.gob:408
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
 msgstr ""
 "Der Server gibt LOGINDISABLED zurück, LOGIN-Authentifizierung wird nicht "
 "verwendet"
 
-#: src/mn-imap-mailbox.gob:419
+#: src/mn-imap-mailbox.gob:409
 msgid "unable to login"
 msgstr "Anmeldung fehlgeschlagen"
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:571
+#: src/mn-imap-mailbox.gob:542
 msgid "server did not send search results"
 msgstr "Der Server hat keine Suchergebnisse gesendet"
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:651
+#: src/mn-imap-mailbox.gob:617
 msgid "server did not send all the messages we requested"
 msgstr "Der Server hat nicht alle angeforderten Nachrichten gesendet"
 
-#: src/mn-imap-mailbox.gob:700
+#: src/mn-imap-mailbox.gob:671
 msgid "unable to fetch message"
 msgstr "Nachrichten konnten nicht abgerufen werden"
 
-#. compliance error
-#: src/mn-imap-mailbox.gob:818
-msgid "server did not send status"
-msgstr "Der Server hat seinen Status nicht bekannt gegeben"
-
-#: src/mn-imap-mailbox.gob:1096 src/mn-pop3-mailbox.gob:972
+#: src/mn-imap-mailbox.gob:1006 src/mn-pop3-mailbox.gob:927
 msgid "unknown server error"
 msgstr "Unbekannter Server-Fehler"
 
-#: src/mn-imap-mailbox.gob:1198 src/mn-pop3-mailbox.gob:227
+#: src/mn-imap-mailbox.gob:1108 src/mn-pop3-mailbox.gob:220
 msgid "server does not support in-band SSL/TLS"
 msgstr "Der Server unterstütz kein band-internes SSL/TLS"
 
-#: src/mn-imap-mailbox.gob:1217 src/mn-pop3-mailbox.gob:885
+#: src/mn-imap-mailbox.gob:1127 src/mn-pop3-mailbox.gob:837
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
@@ -850,24 +923,28 @@ msgstr ""
 "Sie haben eine Authentifizierung mit SASL ausgewählt, jedoch wurde die "
 "Unterstützung für SASL beim Erstellen des Programms nicht eingebaut"
 
-#: src/mn-imap-mailbox.gob:1225 src/mn-pop3-mailbox.gob:897
+#: src/mn-imap-mailbox.gob:1137 src/mn-pop3-mailbox.gob:857
 #, c-format
 msgid "unknown authentication mechanism \"%s\""
 msgstr "Unbekannte Authentifizierungsmethode »%s«"
 
-#: src/mn-imap-mailbox.gob:1246
+#: src/mn-imap-mailbox.gob:1160
 msgid "falling back to IMAP LOGIN authentication"
 msgstr "Es wird auf die Authentifizierung per IMAP LOGIN zurückgegriffen"
 
-#: src/mn-imap-mailbox.gob:1257 src/mn-pop3-mailbox.gob:938
+#: src/mn-imap-mailbox.gob:1172 src/mn-pop3-mailbox.gob:901
 msgid "authentication failed"
 msgstr "Authentifizierung fehlgeschlagen"
 
-#: src/mn-mail-icon.gob:92 ui/summary-dialog.glade.h:2
-msgid "_Launch Mail Reader"
-msgstr "_E-Mail-Programm starten"
+#: src/mn-mail-icon.gob:91
+msgid "Main _Window"
+msgstr "_Hauptfenster"
 
-#: src/mn-mail-icon.gob:93 ui/summary-dialog.glade.h:3
+#: src/mn-mail-icon.gob:92 src/mn-main-window.c:101
+msgid "_Mail Reader"
+msgstr "_E-Mail-Programm"
+
+#: src/mn-mail-icon.gob:93 src/mn-main-window.c:109
 msgid "_Update"
 msgstr "_Aktualisieren"
 
@@ -875,20 +952,20 @@ msgstr "_Aktualisieren"
 msgid "R_emove From Notification Area"
 msgstr "Aus dem Benachrichtigungsfeld entfernen"
 
-#: src/mn-mailbox-properties-dialog.c:109
+#: src/mn-mailbox-properties-dialog.c:156
 msgid "Add a Mailbox"
 msgstr "Ein Postfach hinzufügen"
 
-#: src/mn-mailbox-properties-dialog.c:328
+#: src/mn-mailbox-properties-dialog.c:325
 #, c-format
 msgid "%s Properties"
 msgstr "%s Eigenschaften"
 
-#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:4
+#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:3
 msgid "_Username:"
 msgstr "Ben_utzername:"
 
-#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:3
+#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:2
 msgid "_Password:"
 msgstr "_Passwort:"
 
@@ -928,61 +1005,57 @@ msgstr "Vollständig"
 msgid "Whether the properties are completely filled or not"
 msgstr "Legt fest, ob die Einstellungen vollständig ausgefüllt sind"
 
-#: src/mn-mailbox-view.gob:263 src/mn-message-box.gob:61
+#: src/mn-mailbox-view.gob:271 src/mn-message-view.gob:312
 msgid "Mailbox"
 msgstr "Postfach"
 
 #. format column
-#: src/mn-mailbox-view.gob:279
+#: src/mn-mailbox-view.gob:287
 msgid "Format"
 msgstr "Protokoll"
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "Unable to add mailbox"
 msgstr "Postfach konnte nicht hinzugefügt werden"
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "The mailbox is already in the list."
 msgstr "Dieses Postfach exisitiert bereits in Ihrer Liste."
 
-#: src/mn-mailbox.gob:130
+#: src/mn-mailbox.gob:131
 msgid "The mailbox URI"
 msgstr "Die Postfachadresse"
 
-#: src/mn-mailbox.gob:141
+#: src/mn-mailbox.gob:142
 msgid "The mailbox human-readable name"
 msgstr "Der lesbare Postfachname"
 
-#: src/mn-mailbox.gob:145
+#: src/mn-mailbox.gob:146
 msgid "Whether the mailbox has to be polled or not"
 msgstr "Legt fest, ob das Postfach abgefragt werden muss"
 
-#: src/mn-mailbox.gob:151
-msgid "Whether the mailbox has new mail or not"
-msgstr "Legt fest, ob das Postfach neue Nachrichten enthält"
-
-#: src/mn-mailbox.gob:156
+#: src/mn-mailbox.gob:152
 msgid "The list of new and unread MNMessage objects"
 msgstr "Die Liste neuer und ungelesener MNMessage-Objekte"
 
-#: src/mn-mailbox.gob:210
+#: src/mn-mailbox.gob:206
 msgid "The mailbox error, if any"
 msgstr "Der Postfachfehler, falls vorhanden"
 
-#: src/mn-mailbox.gob:309
+#: src/mn-mailbox.gob:305
 msgid "does not exist"
 msgstr "existiert nicht"
 
-#: src/mn-mailbox.gob:341
+#: src/mn-mailbox.gob:337
 msgid "unknown format"
 msgstr "unbekanntes Format"
 
-#: src/mn-mailbox.gob:407
+#: src/mn-mailbox.gob:403
 #, c-format
-msgid "unable to enable immediate notification for %s: %s"
-msgstr "Die Sofortbenachrichtigung konnte für %s nicht aktiviert werden: %s"
+msgid "unable to enable immediate notification: %s"
+msgstr "die Sofortbenachrichtigung konnte nicht aktiviert werden: %s"
 
-#: src/mn-mailbox.gob:425
+#: src/mn-mailbox.gob:421
 #, fuzzy, c-format
 msgid ""
 "As a fallback, they will be checked every %i second (this delay is "
@@ -1001,7 +1074,7 @@ msgstr[1] ""
 "alle %i Sekunden überprüft (Dieser Wert kann über den Einstellungsdialog "
 "angepasst werden)."
 
-#: src/mn-mailbox.gob:436
+#: src/mn-mailbox.gob:432
 #, fuzzy, c-format
 msgid ""
 "As a fallback, they will be checked every %i minute (this delay is "
@@ -1020,7 +1093,7 @@ msgstr[1] ""
 "alle %i Minuten überprüft (Dieser Wert kann über den Einstellungsdialog "
 "angepasst werden)."
 
-#: src/mn-mailbox.gob:447
+#: src/mn-mailbox.gob:443
 #, fuzzy, c-format
 msgid ""
 "As a fallback, they will be checked approximately every %i minute (this "
@@ -1039,11 +1112,11 @@ msgstr[1] ""
 "alle %i Minuten überprüft (Dieser Wert kann über den Einstellungsdialog "
 "angepasst werden)."
 
-#: src/mn-mailbox.gob:463
+#: src/mn-mailbox.gob:459
 msgid "A monitoring error has occurred"
 msgstr "Bei der Überwachung ist ein Fehler aufgetreten"
 
-#: src/mn-mailbox.gob:464
+#: src/mn-mailbox.gob:460
 #, c-format
 msgid ""
 "Mail Notification was unable to enable immediate notification for one or "
@@ -1052,100 +1125,251 @@ msgstr ""
 "Die E-Mail-Eingangsüberwachung konnte die Sofortbenachrichtigung für ein "
 "oder mehrere Postfächer nicht aktivieren: %s"
 
-#: src/mn-mailboxes.gob:142
+#: src/mn-mailboxes.gob:130
 msgid "Whether one or more of the mailboxes has to be polled"
 msgstr "Legt fest, ob ein oder mehrere Postfächer befragt werden sollen"
 
-#: src/mn-mailboxes.gob:272
+#: src/mn-mailboxes.gob:260
 #, c-format
 msgid "%s is unsupported: %s"
 msgstr "%s wird nicht unterstützt: %s"
 
-#: src/mn-mailboxes.gob:304
+#: src/mn-mailboxes.gob:290
 #, c-format
-msgid "%s has new mail"
-msgstr "%s hat neue Nachrichten"
+msgid "%s has %i new message"
+msgid_plural "%s has %i new messages"
+msgstr[0] "%s hat %i neue Nachricht"
+msgstr[1] "%s hat %i neue Nachrichten"
 
-#: src/mn-mailboxes.gob:304
-#, c-format
-msgid "%s has no new mail"
-msgstr "%s hat keine neuen Nachrichten"
-
-#: src/mn-mailboxes.gob:330
+#: src/mn-mailboxes.gob:307
 #, c-format
 msgid "%s reported an error: %s"
 msgstr "%s hat einen Fehler erzeugt: %s"
 
-#: src/mn-maildir-mailbox.gob:119
+#: src/mn-maildir-mailbox.gob:112
 #, c-format
 msgid "unable to open folder \"new\": %s"
 msgstr "Der Ordner »new« konnte nicht geöffnet werden: %s"
 
-#: src/mn-maildir-mailbox.gob:161
+#: src/mn-maildir-mailbox.gob:141
 #, c-format
 msgid "unable to close folder \"new\": %s"
 msgstr "Der Ordner »new« konnte nicht geschlossen werden: %s"
 
-#: src/mn-maildir-mailbox.gob:164
+#: src/mn-maildir-mailbox.gob:144
 #, c-format
 msgid "error while reading folder \"new\": %s"
 msgstr "Fehler beim Lesen des Ordners »new«: %s"
 
+#. Toplevel
+#: src/mn-main-window.c:92
+msgid "_Mail"
+msgstr "_Nachricht"
+
+#: src/mn-main-window.c:93
+msgid "_Edit"
+msgstr "_Bearbeiten"
+
+#: src/mn-main-window.c:94
+msgid "_View"
+msgstr "_Ansicht"
+
+#: src/mn-main-window.c:95
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: src/mn-main-window.c:103
+msgid "Launch the mail reader"
+msgstr "Das E-Mail-Programm starten"
+
+#. Reload
+#: src/mn-main-window.c:111 src/mn-main.c:230
+msgid "Update the mail status"
+msgstr "Nach neuen Nachrichten sehen"
+
+#: src/mn-main-window.c:117
+msgid "_Close"
+msgstr "_Schließen"
+
+#: src/mn-main-window.c:119
+msgid "Close this window"
+msgstr "Dieses Fenster schließen"
+
+#: src/mn-main-window.c:125
+msgid "_Quit"
+msgstr "_Beenden"
+
+#: src/mn-main-window.c:127 src/mn-main.c:257
+msgid "Quit Mail Notification"
+msgstr "Die E-Mail-Eingangsüberwachung beenden"
+
+#: src/mn-main-window.c:135 src/mn-main-window.c:183
+msgid "_Toolbars"
+msgstr "_Werkzeugleisten"
+
+#: src/mn-main-window.c:137
+msgid "Customize the toolbars"
+msgstr "Die Werkzeugleisten an die eigenen Bedürfnisse anpassen"
+
+#: src/mn-main-window.c:143
+msgid "_Preferences"
+msgstr "_Einstellungen"
+
+#: src/mn-main-window.c:153
+msgid "Toolbars Styl_e"
+msgstr "Werkzeugleistenmodus"
+
+#: src/mn-main-window.c:155
+msgid "Customize the toolbars style"
+msgstr "Den Modus der Werkzeugleisten anpassen"
+
+#: src/mn-main-window.c:163
+msgid "_Contents"
+msgstr "I_nhalt"
+
+#: src/mn-main-window.c:165
+msgid "Display help"
+msgstr "Die Hilfe anzeigen"
+
+#: src/mn-main-window.c:171
+msgid "_About"
+msgstr "_Info"
+
+#: src/mn-main-window.c:173
+msgid "Display credits"
+msgstr "Mitwirkende anzeigen"
+
+#: src/mn-main-window.c:185
+msgid "Show or hide the toolbars"
+msgstr "Die Werkzeugleisten anzeigen oder verstecken"
+
+#: src/mn-main-window.c:192
+msgid "_Statusbar"
+msgstr "_Statusleiste"
+
+#: src/mn-main-window.c:194
+msgid "Show or hide the statusbar"
+msgstr "Die Statusleiste anzeigen oder verstecken"
+
+#: src/mn-main-window.c:205
+msgid "_Desktop Default"
+msgstr "_Systemvorgabe"
+
+#: src/mn-main-window.c:207
+msgid "Set the toolbars style to the desktop default setting"
+msgstr "Den Werkzeugleistenmodus wie vom System vorgegeben benutzen"
+
+#: src/mn-main-window.c:213
+msgid "I_cons Only"
+msgstr "Nur _Symbole"
+
+#: src/mn-main-window.c:215
+msgid "Only display the toolbars icons"
+msgstr "Nur Werkzeugleistensymbole anzeigen"
+
+#: src/mn-main-window.c:221
+msgid "_Text Only"
+msgstr "Nur _Beschriftungen"
+
+#: src/mn-main-window.c:223
+msgid "Only display the toolbars text"
+msgstr "Nur Werkzeugleistentexte anzeigen"
+
+#: src/mn-main-window.c:229
+msgid "Text Belo_w Icons"
+msgstr "Beschriftungen _unter Symbolen"
+
+#: src/mn-main-window.c:231
+msgid "Display the toolbars text below the icons"
+msgstr "Die Werkzeugleistenbeschriftung unter den Symbolen anzeigen"
+
+#: src/mn-main-window.c:237
+msgid "Text Be_side Icons"
+msgstr "Beschriftung _neben Symbolen"
+
+#: src/mn-main-window.c:239
+msgid "Display the toolbars text beside the icons"
+msgstr "Die Werkzeugleistenbeschriftung neben den Symbolen anzeigen"
+
+#: src/mn-main-window.c:363
+#, c-format
+msgid "unable to load menus.xml: %s"
+msgstr "menus.xml konnte nicht geladen werden: %s"
+
+#: src/mn-main-window.c:398
+msgid "Help messages"
+msgstr "Hilfetexte"
+
+#: src/mn-main-window.c:399
+msgid "Count messages"
+msgstr "Nachrichten zählen"
+
+#: src/mn-main-window.c:503
+#, c-format
+msgid "%i new message"
+msgid_plural "%i new messages"
+msgstr[0] "%i neue Nachricht"
+msgstr[1] "%i neue Nachrichten"
+
+#: src/mn-main-window.c:540
+msgid "unable to load toolbars.xml"
+msgstr "toolbars.xml konnte nicht geladen werden"
+
 #: src/mn-main.c:99
 #, c-format
 msgid "Compiled-in mailbox backends: %s\n"
 msgstr "Eingebaute Postfacharten: %s\n"
 
+#: src/mn-main.c:113
+msgid "Gmail timestamps"
+msgstr "Gmail-Zeitstempel"
+
 #: src/mn-main.c:116
 #, c-format
 msgid "Compiled-in features: %s\n"
 msgstr "Eingebaute Programmfähigkeiten: %s\n"
 
-#: src/mn-main.c:175
+#: src/mn-main.c:176
 msgid "Enable informational output"
 msgstr "Ausgabe von Informationen aktivieren"
 
-#: src/mn-main.c:184
-msgid "List compiled-in features and exit"
-msgstr "Eingebaute Programmfähigkeiten anzeigen und beenden"
+#: src/mn-main.c:185
+msgid "List the compiled-in features"
+msgstr "Eingebaute Programmfähigkeiten anzeigen"
 
-#: src/mn-main.c:193
-msgid "Display the mail summary dialog"
-msgstr "Die Nachrichtenübersicht anzeigen"
+#: src/mn-main.c:194
+msgid "Display the main window"
+msgstr "Das Hauptfenster anzeigen"
 
-#: src/mn-main.c:202
+#: src/mn-main.c:203
 msgid "Display the properties dialog"
 msgstr "Den Dialog zum Einstellen der E-Mail-Eingangsüberwachung anzeigen"
 
-#: src/mn-main.c:211
+#: src/mn-main.c:212
 msgid "Display the about dialog"
 msgstr "Den Info-Dialog anzeigen"
 
-#: src/mn-main.c:220
+#: src/mn-main.c:221
 msgid "Close the mail summary popup"
 msgstr "Die Nachrichtenübersicht schließen"
 
-#: src/mn-main.c:229
-msgid "Update the mail status"
-msgstr "Nach neuen Nachrichten sehen"
-
-#: src/mn-main.c:238
+#: src/mn-main.c:239
 msgid "Report the mail status"
 msgstr "Den aktuellen Nachrichten anzeigen"
 
-#: src/mn-main.c:247
-msgid "Unset obsolete GConf configuration and exit"
-msgstr "Veraltete GConf-Konfiguration zurücksetzen und beenden"
+#: src/mn-main.c:248
+msgid "Unset obsolete GConf configuration"
+msgstr "Veraltete GConf-Konfiguration zurücksetzen"
 
 #.
 #. * We can't use mn_error_dialog() because gtk_init() has not been
 #. * called yet.
 #.
-#: src/mn-main.c:273
+#: src/mn-main.c:284
 msgid "multi-threading is not available"
 msgstr "Multi-Threading steht nicht zur Verfügung"
 
-#: src/mn-main.c:320
+#: src/mn-main.c:338
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
@@ -1153,19 +1377,27 @@ msgstr ""
 "Bonobo konnte das Automatisierungsobjekt nicht finden. Bitte überprüfen Sie "
 "Ihre Installation der E-Mail-Eingangsüberwachung."
 
-#: src/mn-main.c:325
+#: src/mn-main.c:344
+msgid "quitting Mail Notification"
+msgstr "E-Mail-Eingangsüberwachung wir beendet"
+
+#: src/mn-main.c:348
+msgid "Mail Notification is not running"
+msgstr "Die E-Mail-Eingangsüberwachung ist nicht aktiv"
+
+#: src/mn-main.c:355
 msgid "Unable to initialize the GnomeVFS library."
 msgstr "Die GnomeVFS-Bibliothek konnte nicht initializiert werden."
 
-#: src/mn-main.c:361
+#: src/mn-main.c:391
 msgid "updating the mail status"
 msgstr "Nachrichtenstatus wird aktualisiert"
 
-#: src/mn-main.c:379
+#: src/mn-main.c:409
 msgid "Mail Notification is already running"
 msgstr "Die E-Mail-Eingangsüberwachung ist bereits aktiv"
 
-#: src/mn-main.c:386
+#: src/mn-main.c:417
 msgid ""
 "Bonobo could not locate the GNOME_MailNotification_Automation.server file. "
 "Please check your Mail Notification installation."
@@ -1174,7 +1406,7 @@ msgstr ""
 "finden. Bitte überprüfen Sie Ihre Installation der E-Mail-"
 "Eingangsüberwachung."
 
-#: src/mn-main.c:390
+#: src/mn-main.c:421
 msgid ""
 "Bonobo was unable to register the automation server. Please check your Mail "
 "Notification installation."
@@ -1182,77 +1414,79 @@ msgstr ""
 "Bonobo konnte den Automatisierungs-Server nicht registrieren.Bitte "
 "überprüfen Sie Ihre Installation der E-Mail-Eingangsüberwachung."
 
-#: src/mn-mbox-mailbox.gob:221
-#, c-format
-msgid "error while reading mailbox: %s"
-msgstr "Postfach konnte nicht neu geladen werden: %s"
-
-#: src/mn-mbox-mailbox.gob:230
+#: src/mn-mbox-mailbox.gob:184
 #, c-format
 msgid "unable to open mailbox: %s"
 msgstr "Postfach konnte nicht geöffnet werden: %s"
 
-#: src/mn-message-box.gob:64
+#: src/mn-message-mime.c:105
+msgid "unable to parse MIME message"
+msgstr "Die MIME-Nachricht konnte nicht analysiert werden"
+
+#: src/mn-message-view.gob:81
+msgid "You have no new mail."
+msgstr "Sie haben keine neuen Nachrichten."
+
+#: src/mn-message-view.gob:321
 msgid "Unreadable message"
 msgstr "Nichtlesbare Nachricht"
 
-#: src/mn-message-box.gob:69
+#: src/mn-message-view.gob:329
 msgid "From"
 msgstr "Von"
 
-#: src/mn-message-box.gob:70
+#: src/mn-message-view.gob:337
 msgid "Subject"
 msgstr "Betreff"
 
-#: src/mn-message-box.gob:75
+#: src/mn-message-view.gob:348
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/mn-message-box.gob:192
+#: src/mn-message.gob:101
+msgid "Unknown"
+msgstr "Inactive"
+
+#: src/mn-message.gob:126
 #, c-format
 msgid "%i second ago"
 msgid_plural "%i seconds ago"
 msgstr[0] "Vor %i Sekunde"
 
-#: src/mn-message-box.gob:196
+#: src/mn-message.gob:130
 #, c-format
-msgid "%i minute ago"
-msgid_plural "%i minutes ago"
-msgstr[0] "Vor %i Minute"
+msgid "about %i minute ago"
+msgid_plural "about %i minutes ago"
+msgstr[0] "vor etwa %i Minute"
+msgstr[1] "vor etwa %i Minuten"
 
-#: src/mn-message-box.gob:201
+#: src/mn-message.gob:135
 #, c-format
-msgid "%i hour ago"
-msgid_plural "%i hours ago"
-msgstr[0] "Vor %i Stunde"
+msgid "about %i hour ago"
+msgid_plural "about %i hours ago"
+msgstr[0] "vor etwa %i Stunde"
+msgstr[1] "vor etwa %i Stunden"
 
-#: src/mn-message-box.gob:206
+#: src/mn-message.gob:140
 #, c-format
-msgid "%i day ago"
-msgid_plural "%i days ago"
-msgstr[0] "Vor %i Tag"
+msgid "about %i day ago"
+msgid_plural "about %i days ago"
+msgstr[0] "vor etwa %i Tag"
+msgstr[1] "vor etwa %i Tagen"
 
-#: src/mn-message-box.gob:211
+#: src/mn-message.gob:145
 #, c-format
-msgid "%i week ago"
-msgid_plural "%i weeks ago"
-msgstr[0] "Vor %i Woche"
-msgstr[1] "Vor %i Wochen"
-
-#: src/mn-message-mime.c:105
-msgid "unable to parse MIME message"
-msgstr "Die MIME-Nachricht konnte nicht analysiert werden"
-
-#: src/mn-message.gob:101
-msgid "Unknown"
-msgstr "Inactive"
+msgid "about %i week ago"
+msgid_plural "about %i weeks ago"
+msgstr[0] "vor etwa %i Woche"
+msgstr[1] "vor etwa %i Wochen"
 
-#: src/mn-mh-mailbox.gob:184
+#: src/mn-mh-mailbox.gob:147
 #, c-format
 msgid "error while reading .mh_sequences: %s"
 msgstr "Fehler beim lesen der .mh_sequences: %s"
 
-#: src/mn-mh-mailbox.gob:196
+#: src/mn-mh-mailbox.gob:157
 #, c-format
 msgid "unable to open .mh_sequences: %s"
 msgstr ".mh_sequences konnten nicht geöffnet werden: %s"
@@ -1261,23 +1495,23 @@ msgstr ".mh_sequences konnten nicht geöffnet werden: %s"
 msgid "detecting"
 msgstr "ermitteln"
 
-#: src/mn-pi-mailbox-properties.gob:76
+#: src/mn-pi-mailbox-properties.gob:75
 msgid "_Hostname:"
 msgstr "_Server:"
 
-#: src/mn-pi-mailbox-properties.gob:94
+#: src/mn-pi-mailbox-properties.gob:93
 msgid "_Details"
 msgstr "_Details"
 
-#: src/mn-pi-mailbox-properties.gob:106
+#: src/mn-pi-mailbox-properties.gob:105
 msgid "sta_ndard"
 msgstr "Sta_ndard"
 
-#: src/mn-pi-mailbox-properties.gob:116
+#: src/mn-pi-mailbox-properties.gob:115
 msgid "_in-band SSL/TLS"
 msgstr "_band-internes SSL/TLS"
 
-#: src/mn-pi-mailbox-properties.gob:126
+#: src/mn-pi-mailbox-properties.gob:125
 msgid "SSL/TLS on sepa_rate port"
 msgstr "SSL/TLS über e_xtra Port"
 
@@ -1301,15 +1535,15 @@ msgstr ""
 msgid "The port number of the POP3 server"
 msgstr "Die Port-Nummer des POP3-Servers"
 
-#: src/mn-pop3-mailbox.gob:273
+#: src/mn-pop3-mailbox.gob:266
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr "Ungültige Argumente für die Anmeldeverzögerung"
 
-#: src/mn-pop3-mailbox.gob:590
+#: src/mn-pop3-mailbox.gob:569
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/mn-pop3-mailbox.gob:729
+#: src/mn-pop3-mailbox.gob:656
 #, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
 msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
@@ -1318,63 +1552,63 @@ msgstr[0] ""
 "gewartetAnmeldeverzögerung wird berücksichtigt, es wird für %i Sekunden "
 "gewartet"
 
-#: src/mn-pop3-mailbox.gob:893
+#: src/mn-pop3-mailbox.gob:849
 msgid "server does not support APOP authentication"
 msgstr "Der Server unterstütz eine Authentifizierung per APOP nicht."
 
-#: src/mn-pop3-mailbox.gob:922
+#: src/mn-pop3-mailbox.gob:884
 msgid "falling back to APOP authentication"
 msgstr "Es wird auf Authentifizierung mit APOP zurück gegriffen."
 
-#: src/mn-pop3-mailbox.gob:927
+#: src/mn-pop3-mailbox.gob:889
 msgid "falling back to USER/PASS authentication"
 msgstr ""
 "Es wird auf Authentifizierung per Nutzername und Passwort zurück gegriffen."
 
-#: src/mn-properties.c:193
+#: src/mn-properties-dialog.c:218
 msgid "top left"
 msgstr "oben links"
 
-#: src/mn-properties.c:194
+#: src/mn-properties-dialog.c:219
 msgid "top right"
 msgstr "oben rechts"
 
-#: src/mn-properties.c:195
+#: src/mn-properties-dialog.c:220
 msgid "bottom left"
 msgstr "unten links"
 
-#: src/mn-properties.c:196
+#: src/mn-properties-dialog.c:221
 msgid "bottom right"
 msgstr "unten rechts"
 
-#: src/mn-properties.c:287
+#: src/mn-properties-dialog.c:323
 msgid "No mailbox selected."
 msgstr "Kein Postfach ausgewählt."
 
-#: src/mn-properties.c:292
+#: src/mn-properties-dialog.c:328
 #, c-format
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
 msgstr[0] "Ein Posfach ausgewählt."
 msgstr[1] "%i Postfächer ausgewählt."
 
-#: src/mn-shell.gob:93
+#: src/mn-shell.gob:96
 msgid "You have new mail."
 msgstr "Sie haben neue Nachrichten."
 
-#: src/mn-shell.gob:360
+#: src/mn-shell.gob:361
 msgid "Mailboxes Having New Mail"
-msgstr "Folgende Postfächer haben neuen Nachrichten"
+msgstr "Folgende Postfächer haben neue Nachrichten"
 
-#: src/mn-shell.gob:362
+#: src/mn-shell.gob:382
 msgid "Errors"
 msgstr "Fehler"
 
-#: src/mn-shell.gob:364
+#: src/mn-shell.gob:403
 msgid "Unsupported Mailboxes"
 msgstr "Nichtunterstützte Postfächer"
 
-#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:418
 msgid "Mail Summary"
 msgstr "Nachrichtenübersicht"
 
@@ -1392,20 +1626,20 @@ msgid "Select _All"
 msgstr "_Alles auswählen"
 
 #: src/mn-stock.c:29
-msgid "_Mail Summary"
-msgstr "_Nachrichtenübersicht"
+msgid "Leave Fullscreen"
+msgstr "Vollbild verlassen"
 
-#: src/mn-sylpheed-mailbox.gob:119
+#: src/mn-sylpheed-mailbox.gob:113
 #, c-format
 msgid "unable to open folder: %s"
 msgstr "Ordner konnte nicht geöffnet werden: %s"
 
-#: src/mn-sylpheed-mailbox.gob:165
+#: src/mn-sylpheed-mailbox.gob:147
 #, c-format
 msgid "unable to close folder: %s"
 msgstr "Ordner konnte nicht geschlossen werden: %s"
 
-#: src/mn-sylpheed-mailbox.gob:168
+#: src/mn-sylpheed-mailbox.gob:150
 #, c-format
 msgid "error while reading folder: %s"
 msgstr "Fehler beim Lesen von Ordner: %s"
@@ -1436,104 +1670,112 @@ msgstr "Der Grund weshalb dieses Postfach nicht unerstützt wird"
 msgid "unsupported"
 msgstr "nicht unterstützt"
 
-#: src/mn-util.c:233
+#: src/mn-util.c:245
 #, c-format
 msgid "error loading image: %s"
 msgstr "Bild konnte nicht geladen werden: %s"
 
-#: src/mn-util.c:271
+#: src/mn-util.c:276
 #, c-format
 msgid "widget \"%s\" not found in interface \"%s\""
 msgstr "Widget »%s« konnte nicht in Interface »%s« gefunden werden"
 
-#: src/mn-util.c:385
+#: src/mn-util.c:390
 msgid "received an invalid URI list"
 msgstr "Es wurde eine ungültige Adressliste erhalten"
 
-#: src/mn-util.c:421
+#: src/mn-util.c:426
 msgid "received an invalid Mozilla URL"
 msgstr "Es wurde eine ungültige Mozilla-Adresse erhalten"
 
-#: src/mn-util.c:514
+#: src/mn-util.c:519
 msgid "Unable to display help"
 msgstr "Die Hilfe kann nicht angezeigt werden"
 
-#: src/mn-util.c:528
+#: src/mn-util.c:533
 #, c-format
 msgid "Unable to create a thread: %s."
 msgstr "Es konnte kein Thread erzeugt werden: %s."
 
-#: src/mn-util.c:705
+#: src/mn-util.c:626
 msgid "_Do not show this message again"
 msgstr "_Diese Meldung nicht erneut anzeigen"
 
-#: src/mn-util.c:789
+#: src/mn-util.c:710
 msgid "A fatal error has occurred in Mail Notification"
 msgstr ""
 "Ein schwerwiegender Fehler ist beim Ausführen der E-Mail-Eingangsüberwachung "
 "aufgetreten"
 
-#: src/mn-util.c:804
+#: src/mn-util.c:725
 #, c-format
 msgid "unable to get current time: %s"
 msgstr "Die aktuelle Zeit konnte nicht ermittelt werden: %s"
 
-#: src/mn-util.c:906
+#: src/mn-util.c:787
 #, c-format
 msgid "invalid signal specification \"%s\""
 msgstr "Ungültige Signalspezifikation »%s«"
 
-#: src/mn-util.c:945
+#: src/mn-util.c:826
 msgid "A command error has occurred in Mail Notification"
 msgstr ""
 "Es ist ein Fehler beim Ausführen eines Befehls in der E-Mail-"
 "Eingangsüberwachung aufgetreten."
 
-#: src/mn-util.c:946
+#: src/mn-util.c:827
 #, c-format
 msgid "Unable to execute \"%s\": %s."
 msgstr "»%s« konnte nicht ausgeführt werden: %s."
 
 #: ui/authentication.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ui/authentication.glade.h:2
 msgid "_Authenticate"
 msgstr "_Authentifizieren:"
 
+#: ui/edit-toolbars.glade.h:1
+msgid "Edit Toolbars"
+msgstr "Werkzeugleisten bearbeiten"
+
+#: ui/edit-toolbars.glade.h:2
+msgid "_Add a New Toolbar"
+msgstr "_Neue Werkzeugleiste hinzufügen"
+
+#: ui/edit-toolbars.glade.h:3
+msgid "_Use Default"
+msgstr "_Vorgabe verwenden"
+
 #: ui/mailbox-properties.glade.h:1
 msgid "_Mailbox type:"
 msgstr "_Art des Postfachs:"
 
 #: ui/properties.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: ui/properties.glade.h:2
 msgid "<span weight=\"bold\">Commands</span>"
 msgstr "<span weight=\"bold\">Befehle</span>"
 
-#: ui/properties.glade.h:3
+#: ui/properties.glade.h:2
 msgid "<span weight=\"bold\">Double-click Action</span>"
 msgstr "<span weight=\"bold\">Aktion bei Doppelklick</span>"
 
-#: ui/properties.glade.h:4
+#: ui/properties.glade.h:3
 msgid "<span weight=\"bold\">Fonts</span>"
 msgstr "<span weight=\"bold\">Schriften</span>"
 
-#: ui/properties.glade.h:5
+#: ui/properties.glade.h:4
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Allgemein</span>"
 
-#: ui/properties.glade.h:6
+#: ui/properties.glade.h:5
 msgid "<span weight=\"bold\">Mailbox List</span>"
 msgstr "<span weight=\"bold\">Postfächer</span>"
 
-#: ui/properties.glade.h:7
+#: ui/properties.glade.h:6
 msgid "<span weight=\"bold\">Position</span>"
 msgstr "<span weight=\"bold\">Position</span>"
 
+#: ui/properties.glade.h:7
+msgid "Co_ntents:"
+msgstr "_Inhalt:"
+
 #: ui/properties.glade.h:8
 msgid "Dis_play mail summary in tooltip"
 msgstr "_Nachrichtenübersicht anzeigen"
@@ -1605,55 +1847,59 @@ msgstr ""
 "Nachrichtenübersicht."
 
 #: ui/properties.glade.h:23
+msgid "Use these _fonts:"
+msgstr "Folgende _Schriften verwenden:"
+
+#: ui/properties.glade.h:24
 msgid "When _all mail is read:"
 msgstr "Wenn alle Nachricht _gelesen wurden:"
 
-#: ui/properties.glade.h:24
+#: ui/properties.glade.h:25
 msgid "When _new mail arrives:"
 msgstr "Wenn neue Nachricht _eintrifft:"
 
-#: ui/properties.glade.h:25
+#: ui/properties.glade.h:26
 msgid "Whether the status icon should blink on errors or not"
 msgstr ""
 "Wenn diese Option gewählt ist, blinkt das  Nachrichtensymbol bei Auftreten "
 "eines Fehlers."
 
-#: ui/properties.glade.h:26
+#: ui/properties.glade.h:27
 msgid "Whether to automatically close the mail summary popup or not"
 msgstr "Legt fest, ob die Nachrichtenübersicht automatisch geschlossen wird"
 
-#: ui/properties.glade.h:27
+#: ui/properties.glade.h:28
 msgid "Whether to display the mail summary in the status icon tooltip or not"
 msgstr ""
 "Legt fest, ob die Nachrichtenübersicht in der Minihilfe des Statussymbols "
 "angezeigt wird"
 
-#: ui/properties.glade.h:28
+#: ui/properties.glade.h:29
 msgid "Whether to display the mail summary popup when new mail arrives or not"
 msgstr ""
 "Legt fest, ob die Nachrichtenübersicht aufklappt wenn eine neue Nachricht "
 "eintrifft"
 
-#: ui/properties.glade.h:29
+#: ui/properties.glade.h:30
 msgid "Whether to hide previously displayed mail or not"
 msgstr "Legt fest, ob zuvor angezeigte Nachrichten erneut angezeigt werden"
 
-#: ui/properties.glade.h:30
+#: ui/properties.glade.h:31
 msgid "Whether to run a command when all mail is read or not"
 msgstr ""
 "Legt fest, ob ein Befehl ausgeführt wird wenn alle Nachrichten gelesen wurden"
 
-#: ui/properties.glade.h:31
+#: ui/properties.glade.h:32
 msgid "Whether to run a command when new mail arrives or not"
 msgstr ""
 "Wenn diese Option ausgewählt ist, können Sie einen Befehl angeben der "
 "ausgeführt wird, sobald eine neue Nachricht eintrifft."
 
-#: ui/properties.glade.h:32
+#: ui/properties.glade.h:33
 msgid "Whether to set a mail reader or not"
 msgstr "Legt das E-Mail-Programm fest"
 
-#: ui/properties.glade.h:33
+#: ui/properties.glade.h:34
 msgid ""
 "Whether to start Mail Notification when you log into your GNOME session or "
 "not"
@@ -1661,60 +1907,49 @@ msgstr ""
 "Wenn diese Option ausgewählt ist, wird die E-Mail-Eingangsüberwachnung beim "
 "Starten von GNOME ebenfalls gestartet."
 
-#: ui/properties.glade.h:34
-msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
-"not"
-msgstr ""
-"Legt fest, ob für den Inhalt der Nachrichtenübersicht eine eigene Schrift "
-"verwendet wird"
-
 #: ui/properties.glade.h:35
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not"
-msgstr ""
-"Legt fest, ob für den Titel der Nachrichtenübersicht eine eigene Schrift "
-"verwendet wird"
-
-#: ui/properties.glade.h:36
 msgid "_Automatically close after:"
 msgstr "_Automatisch schließen nach:"
 
-#: ui/properties.glade.h:37
+#: ui/properties.glade.h:36
 msgid "_Blink on errors"
 msgstr "_Bei Fehler blinken"
 
-#: ui/properties.glade.h:38
-msgid "_Contents font:"
-msgstr "Schrift für den _Inhalt:"
-
-#: ui/properties.glade.h:39
+#: ui/properties.glade.h:37
 msgid "_Delay between mail checks:"
 msgstr "_Nach neuen Nachrichten sehen alle:"
 
-#: ui/properties.glade.h:40
-msgid "_Display the mail summary dialog"
-msgstr "_Nachrichtenübersicht anzeigen"
+#: ui/properties.glade.h:38
+msgid "_Display the main window"
+msgstr "_Hauptfenster anzeigen"
 
-#: ui/properties.glade.h:41
+#: ui/properties.glade.h:39
 msgid "_Enable mail summary popup"
 msgstr "_Aufklappende Nachrichtenübersicht aktivieren"
 
-#: ui/properties.glade.h:42
+#: ui/properties.glade.h:40
 msgid "_Launch the mail reader"
 msgstr "E-Mail-Programm _starten"
 
-#: ui/properties.glade.h:43
+#: ui/properties.glade.h:41
 msgid "_Mail reader:"
 msgstr "_E-Mail-Programm:"
 
-#: ui/properties.glade.h:44
+#: ui/properties.glade.h:42
 msgid "_Start Mail Notification on GNOME login"
 msgstr "_Laden beim Starten von  GNOME"
 
+#: ui/properties.glade.h:43
+msgid "_Title:"
+msgstr "_Titel:"
+
+#: ui/properties.glade.h:44
+msgid "_Update the mail status"
+msgstr "_Nach neuen Nachrichten sehen"
+
 #: ui/properties.glade.h:45
-msgid "_Title font:"
-msgstr "Schrift für den _Titel:"
+msgid "_Use fonts from theme"
+msgstr "Schriften des _Themas verwenden"
 
 #: ui/properties.glade.h:46
 msgid "_Vertical offset:"
@@ -1742,7 +1977,7 @@ msgid ""
 "\n"
 "Mail Notification has been loaded successfully.\n"
 "\n"
-"Since this is the first time you run Mail Notification, you might want to "
+"Since this is the first time you run Mail Notification, you need to "
 "configure it.\n"
 "\n"
 "Note: this message will not be shown anymore. To configure Mail Notification "
@@ -1760,11 +1995,11 @@ msgstr ""
 "\n"
 "Hinweis: Diese Meldung wird nicht erneut angezeigt. Um die E-Mail-"
 "Eingangsüberwachnung zu einem später Zeitpunkt einzustellen, starten Sie "
-"bitte  <span weight=\"bold\">Anwendungen</span> → <span weight=\"bold"
-"\">Desktop-Einstellungen</span> → <span weight=\"bold\">E-Mail-"
-"Eingangsüberwachnung</span> (auf einigen Systemen auch <span weight=\"bold"
-"\">Anwendungen → Präferenzen → erweiterte Präferenzen → E-Mail-"
-"Eingansüberwachung</span>)."
+"bitte  <span weight=\"bold\">Desktop</span> → <span weight=\"bold"
+"\">Einstellungen</span> → <span weight=\"bold\">E-Mail-Eingangsüberwachnung</"
+"span> (auf einigen Systemen auch <span weight=\"bold\">Anwendungen</span> → "
+"<span weight=\"bold\">Desktop-Einstellungen</span> → <span weight=\"bold\">E-"
+"Mail-Eingansüberwachung</span>)."
 
 #: ui/welcome.glade.h:8
 msgid "_Configure Mail Notification"
@@ -1774,6 +2009,9 @@ msgstr "Die E-Mail-Eingangsüberwachung anpassen"
 msgid "_Skip configuration"
 msgstr "Konfiguration über_springen"
 
+#~ msgid "received non-ASCII data from server"
+#~ msgstr "Vom Server wurden nicht-ASCII-Daten übermittelt"
+
 #~ msgid ""
 #~ "As a fallback, they will be checked approximately every %i minute (this "
 #~ "delay is configurable from the Properties Dialog).As a fallback, they "
diff --git a/po/fr.gmo b/po/fr.gmo
Binary files differ.
diff --git a/po/fr.po b/po/fr.po
@@ -1,17 +1,17 @@
 # French translations for mail-notification.
-# Copyright (c) 2003, 2004 Jean-Yves Lefort.
+# Copyright (C) 2003-2005 Jean-Yves Lefort.
 #
 # This file is distributed under the same license as the
 # mail-notification package.
 #
-# Jean-Yves Lefort <jylefort@brutele.be>, 2004.
+# Jean-Yves Lefort <jylefort@brutele.be>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 1.0\n"
+"Project-Id-Version: mail-notification 1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-25 01:43+0100\n"
-"PO-Revision-Date: 2004-11-25 01:40+0100\n"
+"POT-Creation-Date: 2005-03-02 02:32+0100\n"
+"PO-Revision-Date: 2005-03-06 22:30+0100\n"
 "Last-Translator: Jean-Yves Lefort <jylefort@brutele.be>\n"
 "Language-Team: Jean-Yves Lefort <jylefort@brutele.be>\n"
 "MIME-Version: 1.0\n"
@@ -27,14 +27,14 @@ msgstr "automation Notification de Courrier"
 msgid "Mail Notification automation factory"
 msgstr "usine d'automation Notification de Courrier"
 
-#: data/mail-notification-properties.desktop.in.h:1
+#: data/mail-notification-properties.desktop.in.h:1 src/mn-main-window.c:145
 msgid "Configure Mail Notification"
 msgstr "Configurer la Notification de Courrier"
 
 #: data/mail-notification-properties.desktop.in.h:2
 #: data/mail-notification.desktop.in.h:2
-#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:40
-#: src/mn-mail-icon.gob:194 src/mn-main.c:281
+#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:39
+#: src/mn-mail-icon.gob:224 src/mn-main.c:292 ui/main.glade.h:1
 msgid "Mail Notification"
 msgstr "Notification de Courrier"
 
@@ -85,91 +85,100 @@ msgid "Has already been run"
 msgstr "A déjà été exécuté"
 
 #: data/mail-notification.schemas.in.h:11
-msgid "Height of mail summary dialog"
-msgstr "Hauteur de la boîte de dialogue contenant l'aperçu du courrier"
+msgid "Height of edit toolbars dialog"
+msgstr "Hauteur de la boîte de dialogue contenant l'éditeur de barres d'outils"
 
 #: data/mail-notification.schemas.in.h:12
+msgid "Height of main window"
+msgstr "Hauteur de la fenêtre principale"
+
+#: data/mail-notification.schemas.in.h:13
 msgid "Height of properties dialog"
 msgstr "Hauteur de la boîte de dialogue contenant les propriétés"
 
-#: data/mail-notification.schemas.in.h:13
+#: data/mail-notification.schemas.in.h:14
 msgid "Mail read command"
 msgstr "Commande de courrier lu"
 
-#: data/mail-notification.schemas.in.h:14
+#: data/mail-notification.schemas.in.h:15
 msgid "Mail reader command"
 msgstr "Commande de lecteur de courrier"
 
-#: data/mail-notification.schemas.in.h:15
+#: data/mail-notification.schemas.in.h:16
 msgid "Mail summary popup contents font"
 msgstr "Police du contenu du popup d'aperçu du courrier"
 
-#: data/mail-notification.schemas.in.h:16
+#: data/mail-notification.schemas.in.h:17
+msgid "Mail summary popup fonts aspect source"
+msgstr ""
+"Source d'aspect des polices de caractères du popup d'aperçu du courrier"
+
+#: data/mail-notification.schemas.in.h:18
 msgid "Mail summary popup horizontal offset"
 msgstr "Décalage horizontal du popup d'aperçu du courrier"
 
-#: data/mail-notification.schemas.in.h:17
+#: data/mail-notification.schemas.in.h:19
 msgid "Mail summary popup position"
 msgstr "Position du popup d'aperçu du courrier"
 
-#: data/mail-notification.schemas.in.h:18
+#: data/mail-notification.schemas.in.h:20
 msgid "Mail summary popup title font"
 msgstr "Police du titre du popup d'aperçu du courrier"
 
-#: data/mail-notification.schemas.in.h:19
+#: data/mail-notification.schemas.in.h:21
 msgid "Mail summary popup vertical offset"
 msgstr "Décalage vertical du popup d'aperçu du courrier"
 
-#: data/mail-notification.schemas.in.h:20
+#: data/mail-notification.schemas.in.h:22
 msgid "Mailbox list"
 msgstr "Liste des boîtes aux lettres"
 
-#: data/mail-notification.schemas.in.h:21
+#: data/mail-notification.schemas.in.h:23
 msgid "Minutes between mail checks"
 msgstr "Minutes entre les vérifications de courrier"
 
-#: data/mail-notification.schemas.in.h:22
+#: data/mail-notification.schemas.in.h:24
 msgid "Minutes to wait before closing the mail summary popup"
 msgstr "Minutes à attendre avant de fermer le popup d'aperçu du courrier"
 
-#: data/mail-notification.schemas.in.h:23
+#: data/mail-notification.schemas.in.h:25
 msgid "New mail command"
 msgstr "Commande de nouveau message"
 
-#: data/mail-notification.schemas.in.h:24
+#: data/mail-notification.schemas.in.h:26
 msgid "Only display recent mail in mail summary popup"
 msgstr ""
 "Afficher uniquement le courrier récent dans le popup d'aperçu du courrier"
 
-#: data/mail-notification.schemas.in.h:25
+#: data/mail-notification.schemas.in.h:27
 msgid "Run a command when all mail is read"
 msgstr "Exécuter une commande lorsque tout le courrier est lu"
 
-#: data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:28
 msgid "Run a command when new mail arrives"
 msgstr "Exécuter une commande lorsque du nouveau courrier arrive"
 
-#: data/mail-notification.schemas.in.h:27
+#: data/mail-notification.schemas.in.h:29
 msgid "Seconds between mail checks"
 msgstr "Secondes entre les vérifications de courrier"
 
-#: data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:30
 msgid "Seconds to wait before closing the mail summary popup"
 msgstr "Secondes à attendre avant de fermer le popup d'aperçu du courrier"
 
-#: data/mail-notification.schemas.in.h:29
+#: data/mail-notification.schemas.in.h:31
 msgid "Set a mail reader"
 msgstr "Spécifier un lecteur de courrier"
 
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:32
 msgid ""
 "The action to perform when the icon is double-clicked. Must be \"display-"
-"mail-summary\" or \"launch-mail-reader\"."
+"main-window\", \"launch-mail-reader\" or \"update-mail-status\"."
 msgstr ""
 "L'action à effectuer lorsque l'icône est double-clickée. Doit être \"display-"
-"mail-summary\" ou \"launch-mail-reader\"."
+"main-window\", \"launch-mail-reader\" ou \"update-mail-status\"."
 
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:33
 msgid ""
 "The amount of time to wait before closing the mail summary popup (minutes "
 "part)."
@@ -177,7 +186,7 @@ msgstr ""
 "La quantité de temps à attendre avant de fermer le popup d'aperçu du "
 "courrier (partie minutes)."
 
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:34
 msgid ""
 "The amount of time to wait before closing the mail summary popup (seconds "
 "part)."
@@ -185,44 +194,57 @@ msgstr ""
 "La quantité de temps à attendre avant de fermer le popup d'aperçu du "
 "courrier (partie secondes)."
 
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:35
+msgid ""
+"The aspect source of the mail summary popup fonts. Must be \"theme\" or "
+"\"custom\"."
+msgstr ""
+"La source d'aspect des polices de caractères du popup d'aperçu du courrier. "
+"Doit être \"theme\" ou \"custom\"."
+
+#: data/mail-notification.schemas.in.h:36
 msgid "The command to run to launch the mail reader."
 msgstr "La commande à exécuter pour démarrer le lecteur de courrier."
 
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:37
 msgid "The command to run when all mail is read."
 msgstr "La commande à exécuter lorsque tout le courrier est lu"
 
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:38
 msgid "The command to run when new mail arrives."
 msgstr "La commande à exécuter lorsque du nouveau courrier arrive."
 
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:39
 msgid "The custom font to use for the contents of the mail summary popup."
 msgstr ""
 "La police de caractères à utiliser pour le contenu du popup d'aperçu du "
 "courrier."
 
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:40
 msgid "The custom font to use for the title of the mail summary popup."
 msgstr ""
 "La police de caractères à utiliser pour le titre du popup d'aperçu du "
 "courrier."
 
-#: data/mail-notification.schemas.in.h:38
-msgid "The height of the mail summary dialog in pixels."
+#: data/mail-notification.schemas.in.h:41
+msgid "The height of the edit toolbars dialog in pixels."
 msgstr ""
-"La hauteur de la boîte de dialogue contenant l'aperçu du courrier en pixels."
+"La hauteur de la boîte de dialogue contenant l'éditeur de barres d'outils en "
+"pixels."
 
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:42
+msgid "The height of the main window in pixels."
+msgstr "La hauteur de la fenêtre principale en pixels."
+
+#: data/mail-notification.schemas.in.h:43
 msgid "The height of the properties dialog in pixels."
 msgstr "La hauteur de la boîte de dialogue contenant les propriétés en pixels."
 
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:44
 msgid "The list of mailboxes to monitor."
 msgstr "La liste des boîtes aux lettres à surveiller."
 
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:45
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
@@ -230,14 +252,14 @@ msgstr ""
 "La liste des serveurs SSL/TLS (hôte:port) de confiance auxquels il manque un "
 "certificat X509."
 
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:46
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
 msgstr ""
 "La liste des certificats X509 de confiance, représentés par leur empreinte "
 "digitale."
 
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:47
 msgid ""
 "The number of pixels to leave between the left or right side of the screen "
 "and the mail summary popup."
@@ -245,7 +267,7 @@ msgstr ""
 "Le nombre de pixels à laisser entre la gauche ou la droite de l'écran et le "
 "popup d'aperçu du courrier."
 
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:48
 msgid ""
 "The number of pixels to leave between the top or bottom side of the screen "
 "and the mail summary popup."
@@ -253,72 +275,93 @@ msgstr ""
 "Le nombre de pixels à laisser entre le haut ou le bas de l'écran et le popup "
 "d'aperçu du courrier."
 
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:49
 msgid ""
 "The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
 "\"bottom-left\" or \"bottom-right\"."
 msgstr ""
-"La position du popup d'aperçu du courrier. Doit etre \"top-left\", \"top-"
+"La position du popup d'aperçu du courrier. Doit être \"top-left\", \"top-"
 "right\", \"bottom-left\" or \"bottom-right\"."
 
-#: data/mail-notification.schemas.in.h:46
-msgid "The width of the mail summary dialog in pixels."
+#: data/mail-notification.schemas.in.h:50
+msgid ""
+"The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text\", "
+"\"both\" or \"both-horiz\"."
 msgstr ""
-"La largeur de la boîte de dialogue contenant l'aperçu du courrier en pixels."
+"Le style des barres d'outils. Doit être \"desktop-default\", \"icons\", "
+"\"text\", \"both\" ou \"both-horiz\"."
 
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:51
+msgid "The width of the edit toolbars dialog in pixels."
+msgstr ""
+"La largeur de la boîte de dialogue contenant l'éditeur de barres d'outils en "
+"pixels."
+
+#: data/mail-notification.schemas.in.h:52
+msgid "The width of the main window in pixels."
+msgstr "La largeur de la fenêtre principale en pixels."
+
+#: data/mail-notification.schemas.in.h:53
 msgid "The width of the properties dialog in pixels."
 msgstr "La largeur de la boîte de dialogue contenant les propriétés en pixels."
 
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:54
+msgid "Toolbars style"
+msgstr "Style des barres d'outils"
+
+#: data/mail-notification.schemas.in.h:55
 msgid "Trusted servers list"
 msgstr "Liste des serveurs de confiance"
 
-#: data/mail-notification.schemas.in.h:49
-msgid "Use a custom font for the contents of the mail summary popup"
-msgstr ""
-"Utiliser une police de caractères à la carte pour le contenu du popup "
-"d'aperçu du courrier"
+#: data/mail-notification.schemas.in.h:56
+msgid "View statusbar"
+msgstr "Afficher la barre d'état"
 
-#: data/mail-notification.schemas.in.h:50
-msgid "Use a custom font for the title of the mail summary popup"
-msgstr ""
-"Utiliser une police de caractères à la carte pour le titre du popup d'aperçu "
-"du courrier"
+#: data/mail-notification.schemas.in.h:57
+msgid "View toolbars"
+msgstr "Afficher les barres d'outils"
 
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:58
 msgid "Whether Mail Notification has already been run or not."
 msgstr "Si la Notification de Courrier a déjà été exécutée ou pas."
 
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:59
 msgid "Whether the status icon should blink on errors or not."
 msgstr "Si l'icône de statut doit clignoter lors d'erreurs ou pas."
 
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:60
+msgid "Whether the statusbar should be visible or not."
+msgstr "Si la barre d'état doit être visible ou pas."
+
+#: data/mail-notification.schemas.in.h:61
+msgid "Whether the toolbars should be visible or not."
+msgstr "Si les barres d'outils doivent être visibles ou pas."
+
+#: data/mail-notification.schemas.in.h:62
 msgid "Whether to automatically close the mail summary popup or not."
 msgstr ""
 "Si le popup d'aperçu du courrier doit être automatiquement fermé ou pas."
 
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:63
 msgid "Whether to display the mail summary in the status icon tooltip or not."
 msgstr ""
 "Si l'aperçu du courrier doit être affiché dans le tooltip de l'icône de "
 "statut ou pas."
 
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:64
 msgid "Whether to display the mail summary popup when new mail arrives or not."
 msgstr ""
 "Si le popup d'aperçu du courrier doit être affiché lorsque du nouveau "
 "courrier arrive ou pas."
 
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:65
 msgid ""
 "Whether to hide previously displayed mail in the mail summary popup or not."
 msgstr ""
 "Si le courrier précédemment affiché dans le popup d'aperçu du courrier doit "
 "être caché ou pas."
 
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:66
 msgid ""
 "Whether to prevent the immediate notification error dialog from being "
 "displayed or not."
@@ -326,40 +369,29 @@ msgstr ""
 "Si il faut empêcher la boîte de dialogue contenant l'erreur de notification "
 "immédiate de s'afficher ou pas."
 
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:67
 msgid "Whether to run a command when all mail is read or not."
 msgstr ""
 "Si une commande doit être exécutée lorsque tout le courrier est lu ou pas."
 
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:68
 msgid "Whether to run a command when new mail arrives or not."
 msgstr ""
 "Si une commande doit être exécutée lorsque du nouveau courrier arrive ou pas."
 
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:69
 msgid "Whether to set a mail reader or not."
 msgstr "Si un lecteur de courrier est spécifié ou pas."
 
-#: data/mail-notification.schemas.in.h:61
-msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
-"not."
-msgstr ""
-"Si une police de caractères à la carte doit être utilisée pour le contenu du "
-"popup d'aperçu du courrier ou pas."
-
-#: data/mail-notification.schemas.in.h:62
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not."
-msgstr ""
-"Si une police de caractères à la carte doit être utilisée pour le titre du "
-"popup d'aperçu du courrier ou pas."
+#: data/mail-notification.schemas.in.h:70
+msgid "Width of edit toolbars dialog"
+msgstr "Largeur de la boîte de dialogue contenant l'éditeur de barres d'outils"
 
-#: data/mail-notification.schemas.in.h:63
-msgid "Width of mail summary dialog"
-msgstr "Largeur de la boîte de dialogue contenant l'aperçu du courrier"
+#: data/mail-notification.schemas.in.h:71
+msgid "Width of main window"
+msgstr "Largeur de la fenêtre principale"
 
-#: data/mail-notification.schemas.in.h:64
+#: data/mail-notification.schemas.in.h:72
 msgid "Width of properties dialog"
 msgstr "Largeur de la boîte de dialogue contenant les propriétés"
 
@@ -367,6 +399,22 @@ msgstr "Largeur de la boîte de dialogue contenant les propriétés"
 msgid "New Mail"
 msgstr "Nouveau Courrier"
 
+#: src/egg-editable-toolbar.c:536
+msgid "_Remove Toolbar"
+msgstr "_Enlever la Barre d'Outils"
+
+#: src/egg-toolbar-editor.c:558
+msgid "Separator"
+msgstr "Séparateur"
+
+#: src/egg-toolbar-editor.c:588
+msgid ""
+"Drag an item onto the toolbars above to add it, from the toolbars in the "
+"items table to remove it."
+msgstr ""
+"Glissez un élément sur la barre d'outils pour l'y ajouter, et de celle-ci "
+"vers le tableau d'icônes pour l'en enlever."
+
 #: src/eggtrayicon.c:109
 msgid "Orientation"
 msgstr "Orientation"
@@ -375,20 +423,20 @@ msgstr "Orientation"
 msgid "The orientation of the tray."
 msgstr "L'orientation du plateau."
 
-#: src/mn-about-dialog.gob:43
+#: src/mn-about-dialog.gob:42
 msgid "A Mail Notification Icon"
 msgstr "Une Icône de Notification de Courrier"
 
 #. translator: replace with your name and email
-#: src/mn-about-dialog.gob:47
+#: src/mn-about-dialog.gob:46
 msgid "Jean-Yves Lefort <jylefort@brutele.be>"
 msgstr "Jean-Yves Lefort <jylefort@brutele.be>"
 
-#: src/mn-auth-combo-box.gob:101 src/mn-autodetect-mailbox-properties.gob:37
+#: src/mn-auth-combo-box.gob:102 src/mn-autodetect-mailbox-properties.gob:39
 msgid "<span style=\"italic\">autodetect</span>"
 msgstr "<span style=\"italic\">autodétecter</span>"
 
-#: src/mn-authenticated-mailbox.gob:80
+#: src/mn-authenticated-mailbox.gob:85
 #, c-format
 msgid ""
 "Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -402,12 +450,12 @@ msgstr ""
 "\n"
 "Veuillez à nouveau saisir votre mot de passe."
 
-#: src/mn-authenticated-mailbox.gob:81
+#: src/mn-authenticated-mailbox.gob:86
 #, c-format
 msgid "Enter your password for %s mailbox %s."
 msgstr "Entrez votre mot de passe pour la boîte aux lettres %s %s."
 
-#: src/mn-authenticated-mailbox.gob:132
+#: src/mn-authenticated-mailbox.gob:137
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Mail Notification requires a password</"
@@ -420,11 +468,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mn-autodetect-mailbox-properties.gob:68
+#: src/mn-autodetect-mailbox-properties.gob:70
 msgid "_Location:"
 msgstr "_Emplacement:"
 
-#: src/mn-autodetect-mailbox-properties.gob:74
+#: src/mn-autodetect-mailbox-properties.gob:76
 msgid "_Browse..."
 msgstr "_Parcourir..."
 
@@ -432,7 +480,7 @@ msgstr "_Parcourir..."
 msgid "The URI of the mailbox"
 msgstr "L'URI de la boîte aux lettres"
 
-#: src/mn-autodetect-mailbox-properties.gob:118
+#: src/mn-autodetect-mailbox-properties.gob:123
 msgid "Select a File or Folder"
 msgstr "Sélectionnez un Fichier ou Dossier"
 
@@ -569,81 +617,80 @@ msgstr "impossible de lire depuis le serveur: EOF"
 msgid "unable to decode data using SASL: %s"
 msgstr "impossible de décoder les données en utilisant SASL: %s"
 
-#: src/mn-client-session.c:746
+#: src/mn-client-session.c:743
 #, c-format
 msgid "unable to encode data using SASL: %s"
 msgstr "impossible d'encoder les données en utilisant SASL: %s"
 
-#: src/mn-client-session.c:777 src/mn-client-session.c:784
+#: src/mn-client-session.c:774 src/mn-client-session.c:781
 #, c-format
 msgid "unable to write to server: %s"
 msgstr "impossible d'écrire vers le serveur: %s"
 
-#: src/mn-client-session.c:782
+#: src/mn-client-session.c:779
 msgid "unable to write to server: EOF"
 msgstr "impossible d'écrire vers le serveur: EOF"
 
-#: src/mn-client-session.c:814
+#: src/mn-client-session.c:811
 #, c-format
 msgid "unable to encode Base64: %s"
 msgstr "impossible d'encoder en Base64: %s"
 
-#: src/mn-client-session.c:925
+#: src/mn-client-session.c:922
 #, c-format
 msgid "unable to initialize the SASL library: %s"
 msgstr "impossible d'initialiser la bibliothèque SASL: %s"
 
-#: src/mn-client-session.c:934
+#: src/mn-client-session.c:931
 #, c-format
 msgid "unable to retrieve local address of socket: %s"
 msgstr "impossible d'obtenir l'adresse locale du socket: %s"
 
-#: src/mn-client-session.c:940
+#: src/mn-client-session.c:937
 #, c-format
 msgid "unable to retrieve remote address of socket: %s"
 msgstr "impossible d'obtenir l'adresse distante du socket: %s"
 
-#: src/mn-client-session.c:974
+#: src/mn-client-session.c:971
 #, c-format
-msgid "warning: unable to set SASL security properties: %s"
-msgstr ""
-"avertissement: impossible de spécifier les propriétés de sécurité SASL: %s"
+msgid "unable to set SASL security properties: %s"
+msgstr "impossible de spécifier les propriétés de sécurité SASL: %s"
 
-#: src/mn-client-session.c:998
+#: src/mn-client-session.c:995
 msgid ""
 "unable to start SASL authentication: SASL asked for something we did not know"
 msgstr ""
 "impossible de démarrer l'authentification SASL: SASL a demandé quelque chose "
 "que nous ne connaissions pas"
 
-#: src/mn-client-session.c:1017
+#: src/mn-client-session.c:1014
 #, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr "impossible de démarrer l'authentification SASL: %s"
 
-#: src/mn-client-session.c:1021
+#: src/mn-client-session.c:1018
 #, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr "impossible de créer une connection SASL: %s"
 
-#: src/mn-client-session.c:1058
+#: src/mn-client-session.c:1055
 msgid "SASL asked for something we did not know, aborting SASL authentication"
 msgstr ""
 "SASL a demandé quelque chose que nous ne connaissions pas, annulation de "
 "l'authentification SASL"
 
-#: src/mn-client-session.c:1075
+#: src/mn-client-session.c:1072
 #, c-format
 msgid "%s, aborting SASL authentication"
 msgstr "%s, annulation de l'authentification SASL"
 
 #. compliance error
-#: src/mn-client-session.c:1080
+#: src/mn-client-session.c:1077
 #, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr "impossible de décoder l'entrée Base64 du serveur: %s"
 
-#: src/mn-client-session.c:1083
+#: src/mn-client-session.c:1080
 msgid ""
 "the server sent a SASL challenge, but there was a pending initial SASL "
 "client response"
@@ -651,7 +698,7 @@ msgstr ""
 "le serveur a envoyé un défi SASL, mais il y avait une réponse client SASL "
 "initiale en attente"
 
-#: src/mn-client-session.c:1097
+#: src/mn-client-session.c:1094
 msgid ""
 "the server did not send a SASL challenge, but there was no pending initial "
 "SASL client response"
@@ -659,41 +706,50 @@ msgstr ""
 "le serveur n'a pas envoyé de défi SASL, mais il n'y avait pas de réponse "
 "client SASL initiale en attente"
 
-#: src/mn-client-session.c:1122
+#: src/mn-client-session.c:1119
 #, c-format
 msgid "a SASL security layer of strength factor %i is now active"
 msgstr ""
 "une couche de sécurité SASL de facteur de force %i est maintenant active"
 
 #. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: src/mn-client-session.c:1127
+#: src/mn-client-session.c:1124
 #, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr "impossible d'obtenir la propriété SASL_MAXOUTBUF: %s"
 
-#: src/mn-client-session.c:1133
+#: src/mn-client-session.c:1130
 #, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr "avertissement: impossible d'obtenir la propriété SASL_SSF: %s"
 
-#: src/mn-conf.c:145
+#: src/mn-conf.c:238
+msgid "A directory creation error has occurred"
+msgstr "Une erreur de création de répertoire s'est produite"
+
+#: src/mn-conf.c:239
+#, c-format
+msgid "Unable to create directory \"%s\": %s."
+msgstr "Impossible de créer le répertoire \"%s\": %s."
+
+#: src/mn-conf.c:313
 #, c-format
 msgid "recursively unsetting %s"
 msgstr "en train de supprimer récursivement %s"
 
-#: src/mn-conf.c:149
+#: src/mn-conf.c:317
 msgid "syncing the GConf database"
 msgstr "en train de synchroniser la base de données GConf"
 
-#: src/mn-conf.c:152
+#: src/mn-conf.c:320
 msgid "completed"
 msgstr "terminé"
 
-#: src/mn-gmail-mailbox-properties.gob:77
+#: src/mn-gmail-mailbox-properties.gob:76
 msgid "Your Gmail username"
 msgstr "Votre nom d'utilisateur Gmail"
 
-#: src/mn-gmail-mailbox-properties.gob:78
+#: src/mn-gmail-mailbox-properties.gob:77
 msgid ""
 "Your Gmail password (if left blank, you will be prompted for the password "
 "when needed)"
@@ -701,36 +757,59 @@ msgstr ""
 "Votre mot de passe Gmail (si laissé vide, le mot de passe vous sera demandé "
 "en temps utile)"
 
-#: src/mn-gmail-mailbox.gob:82
+#: src/mn-gmail-mailbox.gob:86
 msgid "libsoup has not been compiled with SSL/TLS support"
 msgstr "libsoup n'a pas été compilé avec le support SSL/TLS"
 
-#: src/mn-gmail-mailbox.gob:160
+#: src/mn-gmail-mailbox.gob:164
 #, c-format
 msgid "unable to parse URI \"%s\""
 msgstr "impossible d'interpréter l'URI \"%s\""
 
-#: src/mn-gmail-mailbox.gob:214
+#: src/mn-gmail-mailbox.gob:217
+msgid "received non-UTF-8 data from server"
+msgstr "des données non-UTF-8 ont été reçues du serveur"
+
+#: src/mn-gmail-mailbox.gob:224
 #, c-format
 msgid "unable to transfer data: %s"
 msgstr "impossible de transférer des données: %s"
 
-#: src/mn-gmail-mailbox.gob:335
+#: src/mn-gmail-mailbox.gob:345
 msgid "logging in"
 msgstr "ouverture de session en cours"
 
-#: src/mn-gmail-mailbox.gob:413
+#: src/mn-gmail-mailbox.gob:423
 msgid "login failed"
 msgstr "l'ouverture de session a échoué"
 
-#: src/mn-gmail-mailbox.gob:488
+#: src/mn-gmail-mailbox.gob:496
 msgid "searching for unread mail"
 msgstr "recherche du courrier non lu"
 
 #: src/mn-gmail-mailbox.gob:527
+msgid "unable to initialize the ICU library"
+msgstr "impossible d'initialiser la bibliothèque ICU"
+
+#: src/mn-gmail-mailbox.gob:554
 msgid "unable to parse Gmail data"
 msgstr "impossible d'interpréter les données Gmail"
 
+#: src/mn-gmail-mailbox.gob:891
+#, c-format
+msgid "unable to open calendar: %s"
+msgstr "impossible d'ouvrir le calendrier: %s"
+
+#: src/mn-gmail-mailbox.gob:899
+#, c-format
+msgid "unable to set calendar time: %s"
+msgstr "impossible de spécifier l'heure du calendrier: %s"
+
+#: src/mn-gmail-mailbox.gob:968
+#, c-format
+msgid "unable to get calendar time: %s"
+msgstr "impossible d'obtenir l'heure du calendrier: %s"
+
 #: src/mn-gmime-stream-vfs.gob:49
 #, c-format
 msgid "unable to read %s: %s"
@@ -756,19 +835,19 @@ msgstr "impossible de dire la position de %s: %s"
 msgid "unable to close %s: %s"
 msgstr "impossible de fermer %s: %s"
 
-#: src/mn-imap-mailbox-properties.gob:94
+#: src/mn-imap-mailbox-properties.gob:95
 msgid "Mailbox:"
 msgstr "Boîte aux lettres:"
 
-#: src/mn-imap-mailbox-properties.gob:98
+#: src/mn-imap-mailbox-properties.gob:99
 msgid "in_box"
 msgstr "_boîte de réception"
 
-#: src/mn-imap-mailbox-properties.gob:109
+#: src/mn-imap-mailbox-properties.gob:110
 msgid "oth_er:"
 msgstr "autr_e:"
 
-#: src/mn-imap-mailbox-properties.gob:121
+#: src/mn-imap-mailbox-properties.gob:122
 msgid "U_se idle mode if possible"
 msgstr "Utili_ser le mode idle si possible"
 
@@ -801,52 +880,47 @@ msgstr "Le nom de la boîte aux lettres"
 msgid "If possible, whether to use idle mode or not"
 msgstr "Si possible, si le mode idle doit être utilisé ou pas"
 
-#: src/mn-imap-mailbox.gob:166 src/mn-pop3-mailbox.gob:143
+#: src/mn-imap-mailbox.gob:156 src/mn-pop3-mailbox.gob:136
 msgid "SSL/TLS support has not been compiled in"
 msgstr "le support SSL/TLS n'a pas été inclus lors de la compilation"
 
-#: src/mn-imap-mailbox.gob:246
+#: src/mn-imap-mailbox.gob:236
 msgid "server did not send capabilities"
 msgstr "le serveur n'a pas envoyé ses possibilités"
 
-#: src/mn-imap-mailbox.gob:418
+#: src/mn-imap-mailbox.gob:408
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
 msgstr ""
 "le serveur a annoncé LOGINDISABLED, pas d'utilisation de l'authentification "
 "LOGIN"
 
-#: src/mn-imap-mailbox.gob:419
+#: src/mn-imap-mailbox.gob:409
 msgid "unable to login"
 msgstr "impossible d'ouvrir la session"
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:571
+#: src/mn-imap-mailbox.gob:542
 msgid "server did not send search results"
 msgstr "le serveur n'a pas envoyé les résultats de la recherche"
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:651
+#: src/mn-imap-mailbox.gob:617
 msgid "server did not send all the messages we requested"
 msgstr "le serveur n'a pas envoyé tous les messages que nous avons demandé"
 
-#: src/mn-imap-mailbox.gob:700
+#: src/mn-imap-mailbox.gob:671
 msgid "unable to fetch message"
 msgstr "impossible d'obtenir le message"
 
-#. compliance error
-#: src/mn-imap-mailbox.gob:818
-msgid "server did not send status"
-msgstr "le serveur n'a pas envoyé de statut"
-
-#: src/mn-imap-mailbox.gob:1096 src/mn-pop3-mailbox.gob:972
+#: src/mn-imap-mailbox.gob:1006 src/mn-pop3-mailbox.gob:927
 msgid "unknown server error"
 msgstr "erreur serveur inconnue"
 
-#: src/mn-imap-mailbox.gob:1198 src/mn-pop3-mailbox.gob:227
+#: src/mn-imap-mailbox.gob:1108 src/mn-pop3-mailbox.gob:220
 msgid "server does not support in-band SSL/TLS"
 msgstr "le serveur ne supporte pas le mode SSL/TLS interne"
 
-#: src/mn-imap-mailbox.gob:1217 src/mn-pop3-mailbox.gob:885
+#: src/mn-imap-mailbox.gob:1127 src/mn-pop3-mailbox.gob:837
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
@@ -854,24 +928,28 @@ msgstr ""
 "un mécanisme d'authentification SASL a été sélectionné mais le support SASL "
 "n'a pas été inclus lors de la compilation"
 
-#: src/mn-imap-mailbox.gob:1225 src/mn-pop3-mailbox.gob:897
+#: src/mn-imap-mailbox.gob:1137 src/mn-pop3-mailbox.gob:857
 #, c-format
 msgid "unknown authentication mechanism \"%s\""
 msgstr "mécanisme d'authentification inconnu \"%s\""
 
-#: src/mn-imap-mailbox.gob:1246
+#: src/mn-imap-mailbox.gob:1160
 msgid "falling back to IMAP LOGIN authentication"
 msgstr "rétrogradation vers l'authentification IMAP LOGIN"
 
-#: src/mn-imap-mailbox.gob:1257 src/mn-pop3-mailbox.gob:938
+#: src/mn-imap-mailbox.gob:1172 src/mn-pop3-mailbox.gob:901
 msgid "authentication failed"
 msgstr "l'authentification a échoué"
 
-#: src/mn-mail-icon.gob:92 ui/summary-dialog.glade.h:2
-msgid "_Launch Mail Reader"
-msgstr "_Exécuter le Lecteur de Courrier"
+#: src/mn-mail-icon.gob:91
+msgid "Main _Window"
+msgstr "_Fenêtre Principale"
+
+#: src/mn-mail-icon.gob:92 src/mn-main-window.c:101
+msgid "_Mail Reader"
+msgstr "_Lecteur de Courrier"
 
-#: src/mn-mail-icon.gob:93 ui/summary-dialog.glade.h:3
+#: src/mn-mail-icon.gob:93 src/mn-main-window.c:109
 msgid "_Update"
 msgstr "_Mettre à Jour"
 
@@ -879,20 +957,20 @@ msgstr "_Mettre à Jour"
 msgid "R_emove From Notification Area"
 msgstr "_Enlever de l'Aire de Notification"
 
-#: src/mn-mailbox-properties-dialog.c:109
+#: src/mn-mailbox-properties-dialog.c:156
 msgid "Add a Mailbox"
 msgstr "Ajouter une Boîte aux Lettres"
 
-#: src/mn-mailbox-properties-dialog.c:328
+#: src/mn-mailbox-properties-dialog.c:325
 #, c-format
 msgid "%s Properties"
 msgstr "Propriétés de %s"
 
-#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:4
+#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:3
 msgid "_Username:"
 msgstr "_Nom d'utilisateur:"
 
-#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:3
+#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:2
 msgid "_Password:"
 msgstr "_Mot de passe:"
 
@@ -932,61 +1010,57 @@ msgstr "Complet"
 msgid "Whether the properties are completely filled or not"
 msgstr "Si les propriétés sont complètement remplies ou pas"
 
-#: src/mn-mailbox-view.gob:263 src/mn-message-box.gob:61
+#: src/mn-mailbox-view.gob:271 src/mn-message-view.gob:312
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
 #. format column
-#: src/mn-mailbox-view.gob:279
+#: src/mn-mailbox-view.gob:287
 msgid "Format"
 msgstr "Format"
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "Unable to add mailbox"
 msgstr "Impossible d'ajouter la boîte aux lettres"
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "The mailbox is already in the list."
 msgstr "La boîte aux lettres est déjà dans la liste."
 
-#: src/mn-mailbox.gob:130
+#: src/mn-mailbox.gob:131
 msgid "The mailbox URI"
 msgstr "L'URI de la boîte aux lettres"
 
-#: src/mn-mailbox.gob:141
+#: src/mn-mailbox.gob:142
 msgid "The mailbox human-readable name"
 msgstr "Le nom, lisible par un humain, de la boîte aux lettres"
 
-#: src/mn-mailbox.gob:145
+#: src/mn-mailbox.gob:146
 msgid "Whether the mailbox has to be polled or not"
 msgstr "Si la boîte aux lettres doit être vérifiée explicitement ou pas"
 
-#: src/mn-mailbox.gob:151
-msgid "Whether the mailbox has new mail or not"
-msgstr "Si la boîte aux lettres a du nouveau courrier ou pas"
-
-#: src/mn-mailbox.gob:156
+#: src/mn-mailbox.gob:152
 msgid "The list of new and unread MNMessage objects"
 msgstr "La liste des objets MNMessage neufs et non lus"
 
-#: src/mn-mailbox.gob:210
+#: src/mn-mailbox.gob:206
 msgid "The mailbox error, if any"
 msgstr "L'erreur de la boîte aux lettres si il y en a une"
 
-#: src/mn-mailbox.gob:309
+#: src/mn-mailbox.gob:305
 msgid "does not exist"
 msgstr "n'existe pas"
 
-#: src/mn-mailbox.gob:341
+#: src/mn-mailbox.gob:337
 msgid "unknown format"
 msgstr "format inconnu"
 
-#: src/mn-mailbox.gob:407
+#: src/mn-mailbox.gob:403
 #, c-format
-msgid "unable to enable immediate notification for %s: %s"
-msgstr "impossible d'activer la notification immédiate pour %s: %s"
+msgid "unable to enable immediate notification: %s"
+msgstr "impossible d'activer la notification immédiate: %s"
 
-#: src/mn-mailbox.gob:425
+#: src/mn-mailbox.gob:421
 #, c-format
 msgid ""
 "As a fallback, they will be checked every %i second (this delay is "
@@ -1001,7 +1075,7 @@ msgstr[1] ""
 "Comme solution de secours, elles seront vérifiées toutes les %i secondes (ce "
 "délai est configurable depuis les Propriétés)."
 
-#: src/mn-mailbox.gob:436
+#: src/mn-mailbox.gob:432
 #, c-format
 msgid ""
 "As a fallback, they will be checked every %i minute (this delay is "
@@ -1016,7 +1090,7 @@ msgstr[1] ""
 "Comme solution de secours, elles seront vérifiées toutes les %i minutes (ce "
 "délai est configurable depuis les Propriétés)."
 
-#: src/mn-mailbox.gob:447
+#: src/mn-mailbox.gob:443
 #, c-format
 msgid ""
 "As a fallback, they will be checked approximately every %i minute (this "
@@ -1031,11 +1105,11 @@ msgstr[1] ""
 "Comme solution de secours, elles seront vérifiées approximativement toutes "
 "les %i minutes (ce délai est configurable depuis les Propriétés)."
 
-#: src/mn-mailbox.gob:463
+#: src/mn-mailbox.gob:459
 msgid "A monitoring error has occurred"
 msgstr "Une erreur de surveillance s'est produite"
 
-#: src/mn-mailbox.gob:464
+#: src/mn-mailbox.gob:460
 #, c-format
 msgid ""
 "Mail Notification was unable to enable immediate notification for one or "
@@ -1044,101 +1118,253 @@ msgstr ""
 "La Notification de Courrier n'a pas été en mesure d'activer la notification "
 "immédiate pour une ou plusieures boîtes aux lettres. %s"
 
-#: src/mn-mailboxes.gob:142
+#: src/mn-mailboxes.gob:130
 msgid "Whether one or more of the mailboxes has to be polled"
 msgstr ""
 "Si une ou plusieurs boîtes aux lettres doivent être vérifiées explicitement"
 
-#: src/mn-mailboxes.gob:272
+#: src/mn-mailboxes.gob:260
 #, c-format
 msgid "%s is unsupported: %s"
 msgstr "%s n'est pas pris en charge: %s"
 
-#: src/mn-mailboxes.gob:304
-#, c-format
-msgid "%s has new mail"
-msgstr "%s a du nouveau courrier"
-
-#: src/mn-mailboxes.gob:304
+#: src/mn-mailboxes.gob:290
 #, c-format
-msgid "%s has no new mail"
-msgstr "%s n'a pas de nouveau courrier"
+msgid "%s has %i new message"
+msgid_plural "%s has %i new messages"
+msgstr[0] "%s a %i nouveau message"
+msgstr[1] "%s a %i nouveaux messages"
 
-#: src/mn-mailboxes.gob:330
+#: src/mn-mailboxes.gob:307
 #, c-format
 msgid "%s reported an error: %s"
 msgstr "%s a indiqué une erreur: %s"
 
-#: src/mn-maildir-mailbox.gob:119
+#: src/mn-maildir-mailbox.gob:112
 #, c-format
 msgid "unable to open folder \"new\": %s"
 msgstr "impossible d'ouvrir le dossier \"new\": %s"
 
-#: src/mn-maildir-mailbox.gob:161
+#: src/mn-maildir-mailbox.gob:141
 #, c-format
 msgid "unable to close folder \"new\": %s"
 msgstr "impossible de fermer le dossier \"new\": %s"
 
-#: src/mn-maildir-mailbox.gob:164
+#: src/mn-maildir-mailbox.gob:144
 #, c-format
 msgid "error while reading folder \"new\": %s"
 msgstr "erreur lors de la lecture du dossier \"new\": %s"
 
+#. Toplevel
+#: src/mn-main-window.c:92
+msgid "_Mail"
+msgstr "_Courrier"
+
+#: src/mn-main-window.c:93
+msgid "_Edit"
+msgstr "_Edition"
+
+#: src/mn-main-window.c:94
+msgid "_View"
+msgstr "Afficha_ge"
+
+#: src/mn-main-window.c:95
+msgid "_Help"
+msgstr "_Aide"
+
+#: src/mn-main-window.c:103
+msgid "Launch the mail reader"
+msgstr "Exécuter le lecteur de courrier"
+
+#. Reload
+#: src/mn-main-window.c:111 src/mn-main.c:230
+msgid "Update the mail status"
+msgstr "Mettre à jour le statut du courrier"
+
+#: src/mn-main-window.c:117
+msgid "_Close"
+msgstr "_Fermer"
+
+#: src/mn-main-window.c:119
+msgid "Close this window"
+msgstr "Fermer cette fenêtre"
+
+#: src/mn-main-window.c:125
+msgid "_Quit"
+msgstr "_Quitter"
+
+#: src/mn-main-window.c:127 src/mn-main.c:257
+msgid "Quit Mail Notification"
+msgstr "Quitter la Notification de Courrier"
+
+#: src/mn-main-window.c:135 src/mn-main-window.c:183
+msgid "_Toolbars"
+msgstr "_Barres d'Outils"
+
+#: src/mn-main-window.c:137
+msgid "Customize the toolbars"
+msgstr "Personnaliser les barres d'outils"
+
+#: src/mn-main-window.c:143
+msgid "_Preferences"
+msgstr "_Préférences"
+
+#: src/mn-main-window.c:153
+msgid "Toolbars Styl_e"
+msgstr "Styl_e des Barres d'Outils"
+
+#: src/mn-main-window.c:155
+msgid "Customize the toolbars style"
+msgstr "Personnaliser le style des barres d'outils"
+
+#: src/mn-main-window.c:163
+msgid "_Contents"
+msgstr "_Contenu"
+
+#: src/mn-main-window.c:165
+msgid "Display help"
+msgstr "Afficher l'aide"
+
+#: src/mn-main-window.c:171
+msgid "_About"
+msgstr "_A Propos"
+
+#: src/mn-main-window.c:173
+msgid "Display credits"
+msgstr "Afficher les crédits"
+
+#: src/mn-main-window.c:185
+msgid "Show or hide the toolbars"
+msgstr "Afficher ou cacher les barres d'outils"
+
+#: src/mn-main-window.c:192
+msgid "_Statusbar"
+msgstr "Barre d'_Etat"
+
+#: src/mn-main-window.c:194
+msgid "Show or hide the statusbar"
+msgstr "Afficher ou cacher la barre d'état"
+
+#: src/mn-main-window.c:205
+msgid "_Desktop Default"
+msgstr "Valeur par Défaut du _Bureau"
+
+#: src/mn-main-window.c:207
+msgid "Set the toolbars style to the desktop default setting"
+msgstr ""
+"Utiliser la valeur par défaut du bureau pour le style des barres d'outils"
+
+#: src/mn-main-window.c:213
+msgid "I_cons Only"
+msgstr "Seulement _Icônes"
+
+#: src/mn-main-window.c:215
+msgid "Only display the toolbars icons"
+msgstr "Afficher uniquement les icônes des barres d'outils"
+
+#: src/mn-main-window.c:221
+msgid "_Text Only"
+msgstr "Seulement _Texte"
+
+#: src/mn-main-window.c:223
+msgid "Only display the toolbars text"
+msgstr "Afficher uniquement le texte des barres d'outils"
+
+#: src/mn-main-window.c:229
+msgid "Text Belo_w Icons"
+msgstr "Texte en _Dessous des Icônes"
+
+#: src/mn-main-window.c:231
+msgid "Display the toolbars text below the icons"
+msgstr "Afficher le texte des barres d'outils en dessous des icônes"
+
+#: src/mn-main-window.c:237
+msgid "Text Be_side Icons"
+msgstr "Texte à _Côté des Icônes"
+
+#: src/mn-main-window.c:239
+msgid "Display the toolbars text beside the icons"
+msgstr "Afficher le texte des barres d'outils à côté des icônes"
+
+#: src/mn-main-window.c:363
+#, c-format
+msgid "unable to load menus.xml: %s"
+msgstr "impossible de charger menus.xml: %s"
+
+#: src/mn-main-window.c:398
+msgid "Help messages"
+msgstr "Messages d'aide"
+
+#: src/mn-main-window.c:399
+msgid "Count messages"
+msgstr "Messages de comptes"
+
+#: src/mn-main-window.c:503
+#, c-format
+msgid "%i new message"
+msgid_plural "%i new messages"
+msgstr[0] "%i nouveau message"
+msgstr[1] "%i nouveaux messages"
+
+#: src/mn-main-window.c:540
+msgid "unable to load toolbars.xml"
+msgstr "impossible de charger toolbars.xml"
+
 #: src/mn-main.c:99
 #, c-format
 msgid "Compiled-in mailbox backends: %s\n"
 msgstr "Prises en charge de boîtes aux lettres disponibles: %s\n"
 
+#: src/mn-main.c:113
+msgid "Gmail timestamps"
+msgstr "timestamps Gmail"
+
 #: src/mn-main.c:116
 #, c-format
 msgid "Compiled-in features: %s\n"
 msgstr "Fonctionnalités disponibles: %s\n"
 
-#: src/mn-main.c:175
+#: src/mn-main.c:176
 msgid "Enable informational output"
 msgstr "Activer la sortie informationnelle"
 
-#: src/mn-main.c:184
-msgid "List compiled-in features and exit"
-msgstr "Afficher les fonctionnalités disponibles et quitter"
+#: src/mn-main.c:185
+msgid "List the compiled-in features"
+msgstr "Afficher les fonctionnalités disponibles"
 
-#: src/mn-main.c:193
-msgid "Display the mail summary dialog"
-msgstr "Afficher la boîte de dialogue contenant l'aperçu du courrier"
+#: src/mn-main.c:194
+msgid "Display the main window"
+msgstr "Afficher la fenêtre principale"
 
-#: src/mn-main.c:202
+#: src/mn-main.c:203
 msgid "Display the properties dialog"
 msgstr "Afficher la boîte de dialogue contenant les propriétés"
 
-#: src/mn-main.c:211
+#: src/mn-main.c:212
 msgid "Display the about dialog"
 msgstr "Afficher la boîte de dialogue \"à propos\""
 
-#: src/mn-main.c:220
+#: src/mn-main.c:221
 msgid "Close the mail summary popup"
 msgstr "Fermer le popup d'aperçu du courrier"
 
-#: src/mn-main.c:229
-msgid "Update the mail status"
-msgstr "Mettre à jour le statut du courrier"
-
-#: src/mn-main.c:238
+#: src/mn-main.c:239
 msgid "Report the mail status"
 msgstr "Rapporter le statut du courrier"
 
-#: src/mn-main.c:247
-msgid "Unset obsolete GConf configuration and exit"
-msgstr "Supprimer la configuration GConf obsolète et quitter"
+#: src/mn-main.c:248
+msgid "Unset obsolete GConf configuration"
+msgstr "Supprimer la configuration GConf obsolète"
 
 #.
 #. * We can't use mn_error_dialog() because gtk_init() has not been
 #. * called yet.
 #.
-#: src/mn-main.c:273
+#: src/mn-main.c:284
 msgid "multi-threading is not available"
 msgstr "le multi-threading n'est pas disponible"
 
-#: src/mn-main.c:320
+#: src/mn-main.c:338
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
@@ -1146,19 +1372,27 @@ msgstr ""
 "Bonobo n'a pas pu localiser l'objet automation. Veuillez vérifier votre "
 "installation de la Notification de Courrier."
 
-#: src/mn-main.c:325
+#: src/mn-main.c:344
+msgid "quitting Mail Notification"
+msgstr "en train de quitter la Notification de Courrier"
+
+#: src/mn-main.c:348
+msgid "Mail Notification is not running"
+msgstr "La Notification de Courrier n'est pas en cours d'exécution"
+
+#: src/mn-main.c:355
 msgid "Unable to initialize the GnomeVFS library."
 msgstr "Impossible d'initialiser la bibliothèque GnomeVFS."
 
-#: src/mn-main.c:361
+#: src/mn-main.c:391
 msgid "updating the mail status"
 msgstr "mise à jour du statut du courrier"
 
-#: src/mn-main.c:379
+#: src/mn-main.c:409
 msgid "Mail Notification is already running"
 msgstr "La Notification de Courrier est déjà en cours d'exécution"
 
-#: src/mn-main.c:386
+#: src/mn-main.c:417
 msgid ""
 "Bonobo could not locate the GNOME_MailNotification_Automation.server file. "
 "Please check your Mail Notification installation."
@@ -1166,7 +1400,7 @@ msgstr ""
 "Bonobo n'a pas pu localiser le fichier GNOME_MailNotification_Automation."
 "server. Veuillez vérifier votre installation de la Notification de Courrier."
 
-#: src/mn-main.c:390
+#: src/mn-main.c:421
 msgid ""
 "Bonobo was unable to register the automation server. Please check your Mail "
 "Notification installation."
@@ -1174,81 +1408,80 @@ msgstr ""
 "Bonobo n'a pas été en mesure d'inscrire le serveur d'automation. Veuillez "
 "vérifier votre installation de la Notification de Courrier."
 
-#: src/mn-mbox-mailbox.gob:221
-#, c-format
-msgid "error while reading mailbox: %s"
-msgstr "erreur lors de la lecture de la boîte aux lettres: %s"
-
-#: src/mn-mbox-mailbox.gob:230
+#: src/mn-mbox-mailbox.gob:184
 #, c-format
 msgid "unable to open mailbox: %s"
 msgstr "impossible d'ouvrir la boîte aux lettres: %s"
 
-#: src/mn-message-box.gob:64
+#: src/mn-message-mime.c:105
+msgid "unable to parse MIME message"
+msgstr "impossible d'interpréter le message MIME"
+
+#: src/mn-message-view.gob:81
+msgid "You have no new mail."
+msgstr "Vous n'avez pas de nouveau courrier."
+
+#: src/mn-message-view.gob:321
 msgid "Unreadable message"
 msgstr "Message non lisible"
 
-#: src/mn-message-box.gob:69
+#: src/mn-message-view.gob:329
 msgid "From"
 msgstr "De"
 
-#: src/mn-message-box.gob:70
+#: src/mn-message-view.gob:337
 msgid "Subject"
 msgstr "Sujet"
 
-#: src/mn-message-box.gob:75
+#: src/mn-message-view.gob:348
 msgid "Sent"
 msgstr "Envoyé"
 
-#: src/mn-message-box.gob:192
+#: src/mn-message.gob:101
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: src/mn-message.gob:126
 #, c-format
 msgid "%i second ago"
 msgid_plural "%i seconds ago"
 msgstr[0] "il y a %i seconde"
 msgstr[1] "il y a %i secondes"
 
-#: src/mn-message-box.gob:196
+#: src/mn-message.gob:130
 #, c-format
-msgid "%i minute ago"
-msgid_plural "%i minutes ago"
-msgstr[0] "il y a %i minute"
-msgstr[1] "il y a %i minutes"
+msgid "about %i minute ago"
+msgid_plural "about %i minutes ago"
+msgstr[0] "il y a approximativement %i minute"
+msgstr[1] "il y a approximativement %i minutes"
 
-#: src/mn-message-box.gob:201
+#: src/mn-message.gob:135
 #, c-format
-msgid "%i hour ago"
-msgid_plural "%i hours ago"
-msgstr[0] "il y a %i heure"
-msgstr[1] "il y a %i heures"
+msgid "about %i hour ago"
+msgid_plural "about %i hours ago"
+msgstr[0] "il y a approximativement %i heure"
+msgstr[1] "il y a approximativement %i heures"
 
-#: src/mn-message-box.gob:206
+#: src/mn-message.gob:140
 #, c-format
-msgid "%i day ago"
-msgid_plural "%i days ago"
-msgstr[0] "il y a %i jour"
-msgstr[1] "il y a %i jours"
+msgid "about %i day ago"
+msgid_plural "about %i days ago"
+msgstr[0] "il y a approximativement %i jour"
+msgstr[1] "il y a approximativement %i jours"
 
-#: src/mn-message-box.gob:211
+#: src/mn-message.gob:145
 #, c-format
-msgid "%i week ago"
-msgid_plural "%i weeks ago"
-msgstr[0] "il y a %i semaine"
-msgstr[1] "il y a %i semaines"
-
-#: src/mn-message-mime.c:105
-msgid "unable to parse MIME message"
-msgstr "impossible d'interpréter le message MIME"
-
-#: src/mn-message.gob:101
-msgid "Unknown"
-msgstr "Inconnu"
+msgid "about %i week ago"
+msgid_plural "about %i weeks ago"
+msgstr[0] "il y a approximativement %i semaine"
+msgstr[1] "il y a approximativement %i semaines"
 
-#: src/mn-mh-mailbox.gob:184
+#: src/mn-mh-mailbox.gob:147
 #, c-format
 msgid "error while reading .mh_sequences: %s"
 msgstr "erreur lors de la lecture de .mh_sequences: %s"
 
-#: src/mn-mh-mailbox.gob:196
+#: src/mn-mh-mailbox.gob:157
 #, c-format
 msgid "unable to open .mh_sequences: %s"
 msgstr "impossible d'ouvrir .mh_sequences: %s"
@@ -1257,23 +1490,23 @@ msgstr "impossible d'ouvrir .mh_sequences: %s"
 msgid "detecting"
 msgstr "en cours de détection"
 
-#: src/mn-pi-mailbox-properties.gob:76
+#: src/mn-pi-mailbox-properties.gob:75
 msgid "_Hostname:"
 msgstr "Nom d'_hôte:"
 
-#: src/mn-pi-mailbox-properties.gob:94
+#: src/mn-pi-mailbox-properties.gob:93
 msgid "_Details"
 msgstr "_Détails"
 
-#: src/mn-pi-mailbox-properties.gob:106
+#: src/mn-pi-mailbox-properties.gob:105
 msgid "sta_ndard"
 msgstr "sta_ndard"
 
-#: src/mn-pi-mailbox-properties.gob:116
+#: src/mn-pi-mailbox-properties.gob:115
 msgid "_in-band SSL/TLS"
 msgstr "SSL/TLS _interne"
 
-#: src/mn-pi-mailbox-properties.gob:126
+#: src/mn-pi-mailbox-properties.gob:125
 msgid "SSL/TLS on sepa_rate port"
 msgstr "SSL/TLS sur port sépa_ré"
 
@@ -1297,77 +1530,77 @@ msgstr ""
 msgid "The port number of the POP3 server"
 msgstr "Le numéro de port du serveur POP3"
 
-#: src/mn-pop3-mailbox.gob:273
+#: src/mn-pop3-mailbox.gob:266
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr "arguments invalides pour la possibilité LOGIN-DELAY"
 
-#: src/mn-pop3-mailbox.gob:590
+#: src/mn-pop3-mailbox.gob:569
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: src/mn-pop3-mailbox.gob:729
+#: src/mn-pop3-mailbox.gob:656
 #, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
 msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
 msgstr[0] "attente de %i seconde afin d'obéir à LOGIN-DELAY"
 msgstr[1] "attente de %i secondes afin d'obéir à LOGIN-DELAY"
 
-#: src/mn-pop3-mailbox.gob:893
+#: src/mn-pop3-mailbox.gob:849
 msgid "server does not support APOP authentication"
 msgstr "le serveur ne supporte pas l'authentification APOP"
 
-#: src/mn-pop3-mailbox.gob:922
+#: src/mn-pop3-mailbox.gob:884
 msgid "falling back to APOP authentication"
 msgstr "rétrogradation vers l'authentification APOP"
 
-#: src/mn-pop3-mailbox.gob:927
+#: src/mn-pop3-mailbox.gob:889
 msgid "falling back to USER/PASS authentication"
 msgstr "rétrogradation vers l'authentification USER/PASS"
 
-#: src/mn-properties.c:193
+#: src/mn-properties-dialog.c:218
 msgid "top left"
 msgstr "en haut à gauche"
 
-#: src/mn-properties.c:194
+#: src/mn-properties-dialog.c:219
 msgid "top right"
 msgstr "en haut à droite"
 
-#: src/mn-properties.c:195
+#: src/mn-properties-dialog.c:220
 msgid "bottom left"
 msgstr "en bas à gauche"
 
-#: src/mn-properties.c:196
+#: src/mn-properties-dialog.c:221
 msgid "bottom right"
 msgstr "en bas à droite"
 
-#: src/mn-properties.c:287
+#: src/mn-properties-dialog.c:323
 msgid "No mailbox selected."
 msgstr "Pas de boîte aux lettres sélectionnée."
 
-#: src/mn-properties.c:292
+#: src/mn-properties-dialog.c:328
 #, c-format
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
 msgstr[0] "%i boîte aux lettres sélectionnée"
 msgstr[1] "%i boîtes aux lettres sélectionnées"
 
-#: src/mn-shell.gob:93
+#: src/mn-shell.gob:96
 msgid "You have new mail."
 msgstr "Vous avez du nouveau courrier."
 
-#: src/mn-shell.gob:360
+#: src/mn-shell.gob:361
 msgid "Mailboxes Having New Mail"
 msgstr "Boîtes aux Lettres Ayant du Nouveau Courrier"
 
-#: src/mn-shell.gob:362
+#: src/mn-shell.gob:382
 msgid "Errors"
 msgstr "Erreurs"
 
-#: src/mn-shell.gob:364
+#: src/mn-shell.gob:403
 msgid "Unsupported Mailboxes"
 msgstr "Boîtes aux Lettres Non Supportées"
 
-#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:418
 msgid "Mail Summary"
 msgstr "Aperçu du Courrier"
 
@@ -1385,20 +1618,20 @@ msgid "Select _All"
 msgstr "Sélectionner _Tout"
 
 #: src/mn-stock.c:29
-msgid "_Mail Summary"
-msgstr "_Aperçu du Courrier"
+msgid "Leave Fullscreen"
+msgstr "Quitter le Mode Plein Ecran"
 
-#: src/mn-sylpheed-mailbox.gob:119
+#: src/mn-sylpheed-mailbox.gob:113
 #, c-format
 msgid "unable to open folder: %s"
 msgstr "impossible d'ouvrir le dossier: %s"
 
-#: src/mn-sylpheed-mailbox.gob:165
+#: src/mn-sylpheed-mailbox.gob:147
 #, c-format
 msgid "unable to close folder: %s"
 msgstr "impossible de fermer le dossier: %s"
 
-#: src/mn-sylpheed-mailbox.gob:168
+#: src/mn-sylpheed-mailbox.gob:150
 #, c-format
 msgid "error while reading folder: %s"
 msgstr "erreur lors de la lecture du dossier: %s"
@@ -1430,100 +1663,108 @@ msgstr "La raison pour laquelle la boîte aux lettres n'est pas prise en charge"
 msgid "unsupported"
 msgstr "non pris en charge"
 
-#: src/mn-util.c:233
+#: src/mn-util.c:245
 #, c-format
 msgid "error loading image: %s"
 msgstr "erreur de chargement d'image: %s"
 
-#: src/mn-util.c:271
+#: src/mn-util.c:276
 #, c-format
 msgid "widget \"%s\" not found in interface \"%s\""
 msgstr "élément \"%s\" non trouvé dans interface \"%s\""
 
-#: src/mn-util.c:385
+#: src/mn-util.c:390
 msgid "received an invalid URI list"
 msgstr "une liste d'URI invalide a été reçue"
 
-#: src/mn-util.c:421
+#: src/mn-util.c:426
 msgid "received an invalid Mozilla URL"
 msgstr "une URL Mozilla invalide a été reçue"
 
-#: src/mn-util.c:514
+#: src/mn-util.c:519
 msgid "Unable to display help"
 msgstr "Impossible d'afficher l'aide"
 
-#: src/mn-util.c:528
+#: src/mn-util.c:533
 #, c-format
 msgid "Unable to create a thread: %s."
 msgstr "Impossible de créer un thread: %s."
 
-#: src/mn-util.c:705
+#: src/mn-util.c:626
 msgid "_Do not show this message again"
 msgstr "_Ne plus afficher ce message"
 
-#: src/mn-util.c:789
+#: src/mn-util.c:710
 msgid "A fatal error has occurred in Mail Notification"
 msgstr "Une erreur fatale s'est produite dans la Notification de Courrier"
 
-#: src/mn-util.c:804
+#: src/mn-util.c:725
 #, c-format
 msgid "unable to get current time: %s"
 msgstr "impossible d'obtenir l'heure courante: %s"
 
-#: src/mn-util.c:906
+#: src/mn-util.c:787
 #, c-format
 msgid "invalid signal specification \"%s\""
 msgstr "spécification de signal \"%s\" invalide"
 
-#: src/mn-util.c:945
+#: src/mn-util.c:826
 msgid "A command error has occurred in Mail Notification"
 msgstr "Une erreur de commande s'est produite dans la Notification de Courrier"
 
-#: src/mn-util.c:946
+#: src/mn-util.c:827
 #, c-format
 msgid "Unable to execute \"%s\": %s."
 msgstr "Impossible d'exécuter \"%s\": %s"
 
 #: ui/authentication.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ui/authentication.glade.h:2
 msgid "_Authenticate"
 msgstr "S'_Authentifier"
 
+#: ui/edit-toolbars.glade.h:1
+msgid "Edit Toolbars"
+msgstr "Editer les Barres d'Outils"
+
+#: ui/edit-toolbars.glade.h:2
+msgid "_Add a New Toolbar"
+msgstr "_Ajouter une Nouvelle Barre d'Outils"
+
+#: ui/edit-toolbars.glade.h:3
+msgid "_Use Default"
+msgstr "_Par Défaut"
+
 #: ui/mailbox-properties.glade.h:1
 msgid "_Mailbox type:"
 msgstr "_Type de boîte aux lettres:"
 
 #: ui/properties.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: ui/properties.glade.h:2
 msgid "<span weight=\"bold\">Commands</span>"
 msgstr "<span weight=\"bold\">Commandes</span>"
 
-#: ui/properties.glade.h:3
+#: ui/properties.glade.h:2
 msgid "<span weight=\"bold\">Double-click Action</span>"
 msgstr "<span weight=\"bold\">Action du Double-Click</span>"
 
-#: ui/properties.glade.h:4
+#: ui/properties.glade.h:3
 msgid "<span weight=\"bold\">Fonts</span>"
 msgstr "<span weight=\"bold\">Polices de Caractères</span>"
 
-#: ui/properties.glade.h:5
+#: ui/properties.glade.h:4
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Général</span>"
 
-#: ui/properties.glade.h:6
+#: ui/properties.glade.h:5
 msgid "<span weight=\"bold\">Mailbox List</span>"
 msgstr "<span weight=\"bold\">Liste des Boîtes aux Lettres</span>"
 
-#: ui/properties.glade.h:7
+#: ui/properties.glade.h:6
 msgid "<span weight=\"bold\">Position</span>"
 msgstr "<span weight=\"bold\">Position</span>"
 
+#: ui/properties.glade.h:7
+msgid "Co_ntents:"
+msgstr "Co_ntenu:"
+
 #: ui/properties.glade.h:8
 msgid "Dis_play mail summary in tooltip"
 msgstr "Afficher l'a_perçu du courrier dans le tooltip"
@@ -1594,53 +1835,57 @@ msgstr ""
 "d'aperçu du courrier"
 
 #: ui/properties.glade.h:23
+msgid "Use these _fonts:"
+msgstr "Utiliser ces _polices de caractères:"
+
+#: ui/properties.glade.h:24
 msgid "When _all mail is read:"
 msgstr "Quand _tout le courrier est lu:"
 
-#: ui/properties.glade.h:24
+#: ui/properties.glade.h:25
 msgid "When _new mail arrives:"
 msgstr "Quand du _nouveau courrier arrive:"
 
-#: ui/properties.glade.h:25
+#: ui/properties.glade.h:26
 msgid "Whether the status icon should blink on errors or not"
 msgstr "Si l'icône de statut doit clignoter lors d'erreurs ou pas"
 
-#: ui/properties.glade.h:26
+#: ui/properties.glade.h:27
 msgid "Whether to automatically close the mail summary popup or not"
 msgstr ""
 "Si le popup d'aperçu du courrier doit être automatiquement fermé ou pas"
 
-#: ui/properties.glade.h:27
+#: ui/properties.glade.h:28
 msgid "Whether to display the mail summary in the status icon tooltip or not"
 msgstr ""
 "Si l'aperçu du courrier doit être affiché dans le tooltip de l'icône de "
 "statut ou pas"
 
-#: ui/properties.glade.h:28
+#: ui/properties.glade.h:29
 msgid "Whether to display the mail summary popup when new mail arrives or not"
 msgstr ""
 "Si le popup d'aperçu du courrier doit être affiché lorsque du nouveau "
 "courrier arrive ou pas"
 
-#: ui/properties.glade.h:29
+#: ui/properties.glade.h:30
 msgid "Whether to hide previously displayed mail or not"
 msgstr "Si le courrier précédemment affiché doit être caché ou pas"
 
-#: ui/properties.glade.h:30
+#: ui/properties.glade.h:31
 msgid "Whether to run a command when all mail is read or not"
 msgstr ""
 "Si une commande doit être exécutée lorsque tout le courrier est lu ou pas"
 
-#: ui/properties.glade.h:31
+#: ui/properties.glade.h:32
 msgid "Whether to run a command when new mail arrives or not"
 msgstr ""
 "Si une commande doit être exécutée lorsque du nouveau courrier arrive ou pas"
 
-#: ui/properties.glade.h:32
+#: ui/properties.glade.h:33
 msgid "Whether to set a mail reader or not"
 msgstr "Si un lecteur de courrier est spécifié ou pas"
 
-#: ui/properties.glade.h:33
+#: ui/properties.glade.h:34
 msgid ""
 "Whether to start Mail Notification when you log into your GNOME session or "
 "not"
@@ -1648,61 +1893,50 @@ msgstr ""
 "Si la Notification de Courrier doit être démarrée lorsque vous ouvrez votre "
 "session GNOME ou pas"
 
-#: ui/properties.glade.h:34
-msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
-"not"
-msgstr ""
-"Si une police de caractères à la carte doit être utilisée pour le contenu du "
-"popup d'aperçu du courrier ou pas"
-
 #: ui/properties.glade.h:35
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not"
-msgstr ""
-"Si une police de caractères à la carte doit être utilisée pour le titre du "
-"popup d'aperçu du courrier ou pas"
-
-#: ui/properties.glade.h:36
 msgid "_Automatically close after:"
 msgstr "_Fermer automatiquement après:"
 
-#: ui/properties.glade.h:37
+#: ui/properties.glade.h:36
 msgid "_Blink on errors"
 msgstr "_Clignoter lors d'erreurs"
 
-#: ui/properties.glade.h:38
-msgid "_Contents font:"
-msgstr "Police du _contenu:"
-
-#: ui/properties.glade.h:39
+#: ui/properties.glade.h:37
 msgid "_Delay between mail checks:"
 msgstr "_Délai entre les vérifications de courrier:"
 
-#: ui/properties.glade.h:40
-msgid "_Display the mail summary dialog"
-msgstr "_Afficher la boîte de dialogue contenant l'aperçu du courrier"
+#: ui/properties.glade.h:38
+msgid "_Display the main window"
+msgstr "_Afficher la fenêtre principale"
 
-#: ui/properties.glade.h:41
+#: ui/properties.glade.h:39
 msgid "_Enable mail summary popup"
 msgstr "_Activer le popup d'aperçu du courrier"
 
-#: ui/properties.glade.h:42
+#: ui/properties.glade.h:40
 msgid "_Launch the mail reader"
 msgstr "_Exécuter le lecteur de courrier"
 
-#: ui/properties.glade.h:43
+#: ui/properties.glade.h:41
 msgid "_Mail reader:"
 msgstr "_Lecteur de courrier:"
 
-#: ui/properties.glade.h:44
+#: ui/properties.glade.h:42
 msgid "_Start Mail Notification on GNOME login"
 msgstr ""
 "_Démarrer la Notification de Courrier lors de l'ouverture de session GNOME"
 
+#: ui/properties.glade.h:43
+msgid "_Title:"
+msgstr "_Titre:"
+
+#: ui/properties.glade.h:44
+msgid "_Update the mail status"
+msgstr "_Mettre à jour le statut du courrier"
+
 #: ui/properties.glade.h:45
-msgid "_Title font:"
-msgstr "Police du _titre:"
+msgid "_Use fonts from theme"
+msgstr "_Utiliser les polices de caractères du thème"
 
 #: ui/properties.glade.h:46
 msgid "_Vertical offset:"
@@ -1730,7 +1964,7 @@ msgid ""
 "\n"
 "Mail Notification has been loaded successfully.\n"
 "\n"
-"Since this is the first time you run Mail Notification, you might want to "
+"Since this is the first time you run Mail Notification, you need to "
 "configure it.\n"
 "\n"
 "Note: this message will not be shown anymore. To configure Mail Notification "
@@ -1744,7 +1978,7 @@ msgstr ""
 "La Notification de Courrier a été chargée avec succès.\n"
 "\n"
 "Etant donné que c'est la première fois que vous utilisez la Notification de "
-"Courrier, vous voudrez probablement la configurer.\n"
+"Courrier, il est nécessaire que vous la configuriez.\n"
 "\n"
 "Note: ce message ne sera plus affiché à nouveau. Pour configurer la "
 "Notification de Courrier ultérieurement, choisissez <span weight=\"bold"
diff --git a/po/mail-notification.pot b/po/mail-notification.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-25 01:43+0100\n"
+"POT-Creation-Date: 2005-03-02 02:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,14 +25,14 @@ msgstr ""
 msgid "Mail Notification automation factory"
 msgstr ""
 
-#: data/mail-notification-properties.desktop.in.h:1
+#: data/mail-notification-properties.desktop.in.h:1 src/mn-main-window.c:145
 msgid "Configure Mail Notification"
 msgstr ""
 
 #: data/mail-notification-properties.desktop.in.h:2
 #: data/mail-notification.desktop.in.h:2
-#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:40
-#: src/mn-mail-icon.gob:194 src/mn-main.c:281
+#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:39
+#: src/mn-mail-icon.gob:224 src/mn-main.c:292 ui/main.glade.h:1
 msgid "Mail Notification"
 msgstr ""
 
@@ -81,239 +81,272 @@ msgid "Has already been run"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:11
-msgid "Height of mail summary dialog"
+msgid "Height of edit toolbars dialog"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:12
-msgid "Height of properties dialog"
+msgid "Height of main window"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:13
-msgid "Mail read command"
+msgid "Height of properties dialog"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:14
-msgid "Mail reader command"
+msgid "Mail read command"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:15
-msgid "Mail summary popup contents font"
+msgid "Mail reader command"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:16
-msgid "Mail summary popup horizontal offset"
+msgid "Mail summary popup contents font"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:17
-msgid "Mail summary popup position"
+msgid "Mail summary popup fonts aspect source"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:18
-msgid "Mail summary popup title font"
+msgid "Mail summary popup horizontal offset"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:19
-msgid "Mail summary popup vertical offset"
+msgid "Mail summary popup position"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:20
-msgid "Mailbox list"
+msgid "Mail summary popup title font"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:21
-msgid "Minutes between mail checks"
+msgid "Mail summary popup vertical offset"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:22
-msgid "Minutes to wait before closing the mail summary popup"
+msgid "Mailbox list"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:23
-msgid "New mail command"
+msgid "Minutes between mail checks"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:24
-msgid "Only display recent mail in mail summary popup"
+msgid "Minutes to wait before closing the mail summary popup"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:25
-msgid "Run a command when all mail is read"
+msgid "New mail command"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:26
-msgid "Run a command when new mail arrives"
+msgid "Only display recent mail in mail summary popup"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:27
-msgid "Seconds between mail checks"
+msgid "Run a command when all mail is read"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:28
-msgid "Seconds to wait before closing the mail summary popup"
+msgid "Run a command when new mail arrives"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:29
-msgid "Set a mail reader"
+msgid "Seconds between mail checks"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:30
+msgid "Seconds to wait before closing the mail summary popup"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:31
+msgid "Set a mail reader"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:32
 msgid ""
 "The action to perform when the icon is double-clicked. Must be \"display-"
-"mail-summary\" or \"launch-mail-reader\"."
+"main-window\", \"launch-mail-reader\" or \"update-mail-status\"."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:33
 msgid ""
 "The amount of time to wait before closing the mail summary popup (minutes "
 "part)."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:34
 msgid ""
 "The amount of time to wait before closing the mail summary popup (seconds "
 "part)."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:35
+msgid ""
+"The aspect source of the mail summary popup fonts. Must be \"theme\" or "
+"\"custom\"."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:36
 msgid "The command to run to launch the mail reader."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:37
 msgid "The command to run when all mail is read."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:38
 msgid "The command to run when new mail arrives."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:39
 msgid "The custom font to use for the contents of the mail summary popup."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:40
 msgid "The custom font to use for the title of the mail summary popup."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:38
-msgid "The height of the mail summary dialog in pixels."
+#: data/mail-notification.schemas.in.h:41
+msgid "The height of the edit toolbars dialog in pixels."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:42
+msgid "The height of the main window in pixels."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:43
 msgid "The height of the properties dialog in pixels."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:44
 msgid "The list of mailboxes to monitor."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:45
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:46
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:47
 msgid ""
 "The number of pixels to leave between the left or right side of the screen "
 "and the mail summary popup."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:48
 msgid ""
 "The number of pixels to leave between the top or bottom side of the screen "
 "and the mail summary popup."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:49
 msgid ""
 "The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
 "\"bottom-left\" or \"bottom-right\"."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:46
-msgid "The width of the mail summary dialog in pixels."
+#: data/mail-notification.schemas.in.h:50
+msgid ""
+"The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text\", "
+"\"both\" or \"both-horiz\"."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:51
+msgid "The width of the edit toolbars dialog in pixels."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:52
+msgid "The width of the main window in pixels."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:53
 msgid "The width of the properties dialog in pixels."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:54
+msgid "Toolbars style"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:55
 msgid "Trusted servers list"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:49
-msgid "Use a custom font for the contents of the mail summary popup"
+#: data/mail-notification.schemas.in.h:56
+msgid "View statusbar"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:50
-msgid "Use a custom font for the title of the mail summary popup"
+#: data/mail-notification.schemas.in.h:57
+msgid "View toolbars"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:58
 msgid "Whether Mail Notification has already been run or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:59
 msgid "Whether the status icon should blink on errors or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:60
+msgid "Whether the statusbar should be visible or not."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:61
+msgid "Whether the toolbars should be visible or not."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:62
 msgid "Whether to automatically close the mail summary popup or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:63
 msgid "Whether to display the mail summary in the status icon tooltip or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:64
 msgid "Whether to display the mail summary popup when new mail arrives or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:65
 msgid ""
 "Whether to hide previously displayed mail in the mail summary popup or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:66
 msgid ""
 "Whether to prevent the immediate notification error dialog from being "
 "displayed or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:67
 msgid "Whether to run a command when all mail is read or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:68
 msgid "Whether to run a command when new mail arrives or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:69
 msgid "Whether to set a mail reader or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:61
-msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
-"not."
+#: data/mail-notification.schemas.in.h:70
+msgid "Width of edit toolbars dialog"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:62
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not."
+#: data/mail-notification.schemas.in.h:71
+msgid "Width of main window"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:63
-msgid "Width of mail summary dialog"
-msgstr ""
-
-#: data/mail-notification.schemas.in.h:64
+#: data/mail-notification.schemas.in.h:72
 msgid "Width of properties dialog"
 msgstr ""
 
@@ -321,6 +354,20 @@ msgstr ""
 msgid "New Mail"
 msgstr ""
 
+#: src/egg-editable-toolbar.c:536
+msgid "_Remove Toolbar"
+msgstr ""
+
+#: src/egg-toolbar-editor.c:558
+msgid "Separator"
+msgstr ""
+
+#: src/egg-toolbar-editor.c:588
+msgid ""
+"Drag an item onto the toolbars above to add it, from the toolbars in the "
+"items table to remove it."
+msgstr ""
+
 #: src/eggtrayicon.c:109
 msgid "Orientation"
 msgstr ""
@@ -329,20 +376,20 @@ msgstr ""
 msgid "The orientation of the tray."
 msgstr ""
 
-#: src/mn-about-dialog.gob:43
+#: src/mn-about-dialog.gob:42
 msgid "A Mail Notification Icon"
 msgstr ""
 
 #. translator: replace with your name and email
-#: src/mn-about-dialog.gob:47
+#: src/mn-about-dialog.gob:46
 msgid "Jean-Yves Lefort <jylefort@brutele.be>"
 msgstr ""
 
-#: src/mn-auth-combo-box.gob:101 src/mn-autodetect-mailbox-properties.gob:37
+#: src/mn-auth-combo-box.gob:102 src/mn-autodetect-mailbox-properties.gob:39
 msgid "<span style=\"italic\">autodetect</span>"
 msgstr ""
 
-#: src/mn-authenticated-mailbox.gob:80
+#: src/mn-authenticated-mailbox.gob:85
 #, c-format
 msgid ""
 "Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -351,12 +398,12 @@ msgid ""
 "Please re-enter your password."
 msgstr ""
 
-#: src/mn-authenticated-mailbox.gob:81
+#: src/mn-authenticated-mailbox.gob:86
 #, c-format
 msgid "Enter your password for %s mailbox %s."
 msgstr ""
 
-#: src/mn-authenticated-mailbox.gob:132
+#: src/mn-authenticated-mailbox.gob:137
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Mail Notification requires a password</"
@@ -365,11 +412,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/mn-autodetect-mailbox-properties.gob:68
+#: src/mn-autodetect-mailbox-properties.gob:70
 msgid "_Location:"
 msgstr ""
 
-#: src/mn-autodetect-mailbox-properties.gob:74
+#: src/mn-autodetect-mailbox-properties.gob:76
 msgid "_Browse..."
 msgstr ""
 
@@ -377,7 +424,7 @@ msgstr ""
 msgid "The URI of the mailbox"
 msgstr ""
 
-#: src/mn-autodetect-mailbox-properties.gob:118
+#: src/mn-autodetect-mailbox-properties.gob:123
 msgid "Select a File or Folder"
 msgstr ""
 
@@ -507,156 +554,188 @@ msgstr ""
 msgid "unable to decode data using SASL: %s"
 msgstr ""
 
-#: src/mn-client-session.c:746
+#: src/mn-client-session.c:743
 #, c-format
 msgid "unable to encode data using SASL: %s"
 msgstr ""
 
-#: src/mn-client-session.c:777 src/mn-client-session.c:784
+#: src/mn-client-session.c:774 src/mn-client-session.c:781
 #, c-format
 msgid "unable to write to server: %s"
 msgstr ""
 
-#: src/mn-client-session.c:782
+#: src/mn-client-session.c:779
 msgid "unable to write to server: EOF"
 msgstr ""
 
-#: src/mn-client-session.c:814
+#: src/mn-client-session.c:811
 #, c-format
 msgid "unable to encode Base64: %s"
 msgstr ""
 
-#: src/mn-client-session.c:925
+#: src/mn-client-session.c:922
 #, c-format
 msgid "unable to initialize the SASL library: %s"
 msgstr ""
 
-#: src/mn-client-session.c:934
+#: src/mn-client-session.c:931
 #, c-format
 msgid "unable to retrieve local address of socket: %s"
 msgstr ""
 
-#: src/mn-client-session.c:940
+#: src/mn-client-session.c:937
 #, c-format
 msgid "unable to retrieve remote address of socket: %s"
 msgstr ""
 
-#: src/mn-client-session.c:974
+#: src/mn-client-session.c:971
 #, c-format
-msgid "warning: unable to set SASL security properties: %s"
+msgid "unable to set SASL security properties: %s"
 msgstr ""
 
-#: src/mn-client-session.c:998
+#: src/mn-client-session.c:995
 msgid ""
 "unable to start SASL authentication: SASL asked for something we did not know"
 msgstr ""
 
-#: src/mn-client-session.c:1017
+#: src/mn-client-session.c:1014
 #, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr ""
 
-#: src/mn-client-session.c:1021
+#: src/mn-client-session.c:1018
 #, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr ""
 
-#: src/mn-client-session.c:1058
+#: src/mn-client-session.c:1055
 msgid "SASL asked for something we did not know, aborting SASL authentication"
 msgstr ""
 
-#: src/mn-client-session.c:1075
+#: src/mn-client-session.c:1072
 #, c-format
 msgid "%s, aborting SASL authentication"
 msgstr ""
 
 #. compliance error
-#: src/mn-client-session.c:1080
+#: src/mn-client-session.c:1077
 #, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr ""
 
-#: src/mn-client-session.c:1083
+#: src/mn-client-session.c:1080
 msgid ""
 "the server sent a SASL challenge, but there was a pending initial SASL "
 "client response"
 msgstr ""
 
-#: src/mn-client-session.c:1097
+#: src/mn-client-session.c:1094
 msgid ""
 "the server did not send a SASL challenge, but there was no pending initial "
 "SASL client response"
 msgstr ""
 
-#: src/mn-client-session.c:1122
+#: src/mn-client-session.c:1119
 #, c-format
 msgid "a SASL security layer of strength factor %i is now active"
 msgstr ""
 
 #. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: src/mn-client-session.c:1127
+#: src/mn-client-session.c:1124
 #, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr ""
 
-#: src/mn-client-session.c:1133
+#: src/mn-client-session.c:1130
 #, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr ""
 
-#: src/mn-conf.c:145
+#: src/mn-conf.c:238
+msgid "A directory creation error has occurred"
+msgstr ""
+
+#: src/mn-conf.c:239
+#, c-format
+msgid "Unable to create directory \"%s\": %s."
+msgstr ""
+
+#: src/mn-conf.c:313
 #, c-format
 msgid "recursively unsetting %s"
 msgstr ""
 
-#: src/mn-conf.c:149
+#: src/mn-conf.c:317
 msgid "syncing the GConf database"
 msgstr ""
 
-#: src/mn-conf.c:152
+#: src/mn-conf.c:320
 msgid "completed"
 msgstr ""
 
-#: src/mn-gmail-mailbox-properties.gob:77
+#: src/mn-gmail-mailbox-properties.gob:76
 msgid "Your Gmail username"
 msgstr ""
 
-#: src/mn-gmail-mailbox-properties.gob:78
+#: src/mn-gmail-mailbox-properties.gob:77
 msgid ""
 "Your Gmail password (if left blank, you will be prompted for the password "
 "when needed)"
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:82
+#: src/mn-gmail-mailbox.gob:86
 msgid "libsoup has not been compiled with SSL/TLS support"
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:160
+#: src/mn-gmail-mailbox.gob:164
 #, c-format
 msgid "unable to parse URI \"%s\""
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:214
+#: src/mn-gmail-mailbox.gob:217
+msgid "received non-UTF-8 data from server"
+msgstr ""
+
+#: src/mn-gmail-mailbox.gob:224
 #, c-format
 msgid "unable to transfer data: %s"
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:335
+#: src/mn-gmail-mailbox.gob:345
 msgid "logging in"
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:413
+#: src/mn-gmail-mailbox.gob:423
 msgid "login failed"
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:488
+#: src/mn-gmail-mailbox.gob:496
 msgid "searching for unread mail"
 msgstr ""
 
 #: src/mn-gmail-mailbox.gob:527
+msgid "unable to initialize the ICU library"
+msgstr ""
+
+#: src/mn-gmail-mailbox.gob:554
 msgid "unable to parse Gmail data"
 msgstr ""
 
+#: src/mn-gmail-mailbox.gob:891
+#, c-format
+msgid "unable to open calendar: %s"
+msgstr ""
+
+#: src/mn-gmail-mailbox.gob:899
+#, c-format
+msgid "unable to set calendar time: %s"
+msgstr ""
+
+#: src/mn-gmail-mailbox.gob:968
+#, c-format
+msgid "unable to get calendar time: %s"
+msgstr ""
+
 #: src/mn-gmime-stream-vfs.gob:49
 #, c-format
 msgid "unable to read %s: %s"
@@ -682,19 +761,19 @@ msgstr ""
 msgid "unable to close %s: %s"
 msgstr ""
 
-#: src/mn-imap-mailbox-properties.gob:94
+#: src/mn-imap-mailbox-properties.gob:95
 msgid "Mailbox:"
 msgstr ""
 
-#: src/mn-imap-mailbox-properties.gob:98
+#: src/mn-imap-mailbox-properties.gob:99
 msgid "in_box"
 msgstr ""
 
-#: src/mn-imap-mailbox-properties.gob:109
+#: src/mn-imap-mailbox-properties.gob:110
 msgid "oth_er:"
 msgstr ""
 
-#: src/mn-imap-mailbox-properties.gob:121
+#: src/mn-imap-mailbox-properties.gob:122
 msgid "U_se idle mode if possible"
 msgstr ""
 
@@ -725,73 +804,72 @@ msgstr ""
 msgid "If possible, whether to use idle mode or not"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:166 src/mn-pop3-mailbox.gob:143
+#: src/mn-imap-mailbox.gob:156 src/mn-pop3-mailbox.gob:136
 msgid "SSL/TLS support has not been compiled in"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:246
+#: src/mn-imap-mailbox.gob:236
 msgid "server did not send capabilities"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:418
+#: src/mn-imap-mailbox.gob:408
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:419
+#: src/mn-imap-mailbox.gob:409
 msgid "unable to login"
 msgstr ""
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:571
+#: src/mn-imap-mailbox.gob:542
 msgid "server did not send search results"
 msgstr ""
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:651
+#: src/mn-imap-mailbox.gob:617
 msgid "server did not send all the messages we requested"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:700
+#: src/mn-imap-mailbox.gob:671
 msgid "unable to fetch message"
 msgstr ""
 
-#. compliance error
-#: src/mn-imap-mailbox.gob:818
-msgid "server did not send status"
-msgstr ""
-
-#: src/mn-imap-mailbox.gob:1096 src/mn-pop3-mailbox.gob:972
+#: src/mn-imap-mailbox.gob:1006 src/mn-pop3-mailbox.gob:927
 msgid "unknown server error"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:1198 src/mn-pop3-mailbox.gob:227
+#: src/mn-imap-mailbox.gob:1108 src/mn-pop3-mailbox.gob:220
 msgid "server does not support in-band SSL/TLS"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:1217 src/mn-pop3-mailbox.gob:885
+#: src/mn-imap-mailbox.gob:1127 src/mn-pop3-mailbox.gob:837
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:1225 src/mn-pop3-mailbox.gob:897
+#: src/mn-imap-mailbox.gob:1137 src/mn-pop3-mailbox.gob:857
 #, c-format
 msgid "unknown authentication mechanism \"%s\""
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:1246
+#: src/mn-imap-mailbox.gob:1160
 msgid "falling back to IMAP LOGIN authentication"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:1257 src/mn-pop3-mailbox.gob:938
+#: src/mn-imap-mailbox.gob:1172 src/mn-pop3-mailbox.gob:901
 msgid "authentication failed"
 msgstr ""
 
-#: src/mn-mail-icon.gob:92 ui/summary-dialog.glade.h:2
-msgid "_Launch Mail Reader"
+#: src/mn-mail-icon.gob:91
+msgid "Main _Window"
+msgstr ""
+
+#: src/mn-mail-icon.gob:92 src/mn-main-window.c:101
+msgid "_Mail Reader"
 msgstr ""
 
-#: src/mn-mail-icon.gob:93 ui/summary-dialog.glade.h:3
+#: src/mn-mail-icon.gob:93 src/mn-main-window.c:109
 msgid "_Update"
 msgstr ""
 
@@ -799,20 +877,20 @@ msgstr ""
 msgid "R_emove From Notification Area"
 msgstr ""
 
-#: src/mn-mailbox-properties-dialog.c:109
+#: src/mn-mailbox-properties-dialog.c:156
 msgid "Add a Mailbox"
 msgstr ""
 
-#: src/mn-mailbox-properties-dialog.c:328
+#: src/mn-mailbox-properties-dialog.c:325
 #, c-format
 msgid "%s Properties"
 msgstr ""
 
-#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:4
+#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:3
 msgid "_Username:"
 msgstr ""
 
-#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:3
+#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:2
 msgid "_Password:"
 msgstr ""
 
@@ -852,61 +930,57 @@ msgstr ""
 msgid "Whether the properties are completely filled or not"
 msgstr ""
 
-#: src/mn-mailbox-view.gob:263 src/mn-message-box.gob:61
+#: src/mn-mailbox-view.gob:271 src/mn-message-view.gob:312
 msgid "Mailbox"
 msgstr ""
 
 #. format column
-#: src/mn-mailbox-view.gob:279
+#: src/mn-mailbox-view.gob:287
 msgid "Format"
 msgstr ""
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "Unable to add mailbox"
 msgstr ""
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "The mailbox is already in the list."
 msgstr ""
 
-#: src/mn-mailbox.gob:130
+#: src/mn-mailbox.gob:131
 msgid "The mailbox URI"
 msgstr ""
 
-#: src/mn-mailbox.gob:141
+#: src/mn-mailbox.gob:142
 msgid "The mailbox human-readable name"
 msgstr ""
 
-#: src/mn-mailbox.gob:145
+#: src/mn-mailbox.gob:146
 msgid "Whether the mailbox has to be polled or not"
 msgstr ""
 
-#: src/mn-mailbox.gob:151
-msgid "Whether the mailbox has new mail or not"
-msgstr ""
-
-#: src/mn-mailbox.gob:156
+#: src/mn-mailbox.gob:152
 msgid "The list of new and unread MNMessage objects"
 msgstr ""
 
-#: src/mn-mailbox.gob:210
+#: src/mn-mailbox.gob:206
 msgid "The mailbox error, if any"
 msgstr ""
 
-#: src/mn-mailbox.gob:309
+#: src/mn-mailbox.gob:305
 msgid "does not exist"
 msgstr ""
 
-#: src/mn-mailbox.gob:341
+#: src/mn-mailbox.gob:337
 msgid "unknown format"
 msgstr ""
 
-#: src/mn-mailbox.gob:407
+#: src/mn-mailbox.gob:403
 #, c-format
-msgid "unable to enable immediate notification for %s: %s"
+msgid "unable to enable immediate notification: %s"
 msgstr ""
 
-#: src/mn-mailbox.gob:425
+#: src/mn-mailbox.gob:421
 #, c-format
 msgid ""
 "As a fallback, they will be checked every %i second (this delay is "
@@ -917,7 +991,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-mailbox.gob:436
+#: src/mn-mailbox.gob:432
 #, c-format
 msgid ""
 "As a fallback, they will be checked every %i minute (this delay is "
@@ -928,7 +1002,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-mailbox.gob:447
+#: src/mn-mailbox.gob:443
 #, c-format
 msgid ""
 "As a fallback, they will be checked approximately every %i minute (this "
@@ -939,215 +1013,373 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-mailbox.gob:463
+#: src/mn-mailbox.gob:459
 msgid "A monitoring error has occurred"
 msgstr ""
 
-#: src/mn-mailbox.gob:464
+#: src/mn-mailbox.gob:460
 #, c-format
 msgid ""
 "Mail Notification was unable to enable immediate notification for one or "
 "more mailboxes. %s"
 msgstr ""
 
-#: src/mn-mailboxes.gob:142
+#: src/mn-mailboxes.gob:130
 msgid "Whether one or more of the mailboxes has to be polled"
 msgstr ""
 
-#: src/mn-mailboxes.gob:272
+#: src/mn-mailboxes.gob:260
 #, c-format
 msgid "%s is unsupported: %s"
 msgstr ""
 
-#: src/mn-mailboxes.gob:304
-#, c-format
-msgid "%s has new mail"
-msgstr ""
-
-#: src/mn-mailboxes.gob:304
+#: src/mn-mailboxes.gob:290
 #, c-format
-msgid "%s has no new mail"
-msgstr ""
+msgid "%s has %i new message"
+msgid_plural "%s has %i new messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/mn-mailboxes.gob:330
+#: src/mn-mailboxes.gob:307
 #, c-format
 msgid "%s reported an error: %s"
 msgstr ""
 
-#: src/mn-maildir-mailbox.gob:119
+#: src/mn-maildir-mailbox.gob:112
 #, c-format
 msgid "unable to open folder \"new\": %s"
 msgstr ""
 
-#: src/mn-maildir-mailbox.gob:161
+#: src/mn-maildir-mailbox.gob:141
 #, c-format
 msgid "unable to close folder \"new\": %s"
 msgstr ""
 
-#: src/mn-maildir-mailbox.gob:164
+#: src/mn-maildir-mailbox.gob:144
 #, c-format
 msgid "error while reading folder \"new\": %s"
 msgstr ""
 
+#. Toplevel
+#: src/mn-main-window.c:92
+msgid "_Mail"
+msgstr ""
+
+#: src/mn-main-window.c:93
+msgid "_Edit"
+msgstr ""
+
+#: src/mn-main-window.c:94
+msgid "_View"
+msgstr ""
+
+#: src/mn-main-window.c:95
+msgid "_Help"
+msgstr ""
+
+#: src/mn-main-window.c:103
+msgid "Launch the mail reader"
+msgstr ""
+
+#. Reload
+#: src/mn-main-window.c:111 src/mn-main.c:230
+msgid "Update the mail status"
+msgstr ""
+
+#: src/mn-main-window.c:117
+msgid "_Close"
+msgstr ""
+
+#: src/mn-main-window.c:119
+msgid "Close this window"
+msgstr ""
+
+#: src/mn-main-window.c:125
+msgid "_Quit"
+msgstr ""
+
+#: src/mn-main-window.c:127 src/mn-main.c:257
+msgid "Quit Mail Notification"
+msgstr ""
+
+#: src/mn-main-window.c:135 src/mn-main-window.c:183
+msgid "_Toolbars"
+msgstr ""
+
+#: src/mn-main-window.c:137
+msgid "Customize the toolbars"
+msgstr ""
+
+#: src/mn-main-window.c:143
+msgid "_Preferences"
+msgstr ""
+
+#: src/mn-main-window.c:153
+msgid "Toolbars Styl_e"
+msgstr ""
+
+#: src/mn-main-window.c:155
+msgid "Customize the toolbars style"
+msgstr ""
+
+#: src/mn-main-window.c:163
+msgid "_Contents"
+msgstr ""
+
+#: src/mn-main-window.c:165
+msgid "Display help"
+msgstr ""
+
+#: src/mn-main-window.c:171
+msgid "_About"
+msgstr ""
+
+#: src/mn-main-window.c:173
+msgid "Display credits"
+msgstr ""
+
+#: src/mn-main-window.c:185
+msgid "Show or hide the toolbars"
+msgstr ""
+
+#: src/mn-main-window.c:192
+msgid "_Statusbar"
+msgstr ""
+
+#: src/mn-main-window.c:194
+msgid "Show or hide the statusbar"
+msgstr ""
+
+#: src/mn-main-window.c:205
+msgid "_Desktop Default"
+msgstr ""
+
+#: src/mn-main-window.c:207
+msgid "Set the toolbars style to the desktop default setting"
+msgstr ""
+
+#: src/mn-main-window.c:213
+msgid "I_cons Only"
+msgstr ""
+
+#: src/mn-main-window.c:215
+msgid "Only display the toolbars icons"
+msgstr ""
+
+#: src/mn-main-window.c:221
+msgid "_Text Only"
+msgstr ""
+
+#: src/mn-main-window.c:223
+msgid "Only display the toolbars text"
+msgstr ""
+
+#: src/mn-main-window.c:229
+msgid "Text Belo_w Icons"
+msgstr ""
+
+#: src/mn-main-window.c:231
+msgid "Display the toolbars text below the icons"
+msgstr ""
+
+#: src/mn-main-window.c:237
+msgid "Text Be_side Icons"
+msgstr ""
+
+#: src/mn-main-window.c:239
+msgid "Display the toolbars text beside the icons"
+msgstr ""
+
+#: src/mn-main-window.c:363
+#, c-format
+msgid "unable to load menus.xml: %s"
+msgstr ""
+
+#: src/mn-main-window.c:398
+msgid "Help messages"
+msgstr ""
+
+#: src/mn-main-window.c:399
+msgid "Count messages"
+msgstr ""
+
+#: src/mn-main-window.c:503
+#, c-format
+msgid "%i new message"
+msgid_plural "%i new messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/mn-main-window.c:540
+msgid "unable to load toolbars.xml"
+msgstr ""
+
 #: src/mn-main.c:99
 #, c-format
 msgid "Compiled-in mailbox backends: %s\n"
 msgstr ""
 
+#: src/mn-main.c:113
+msgid "Gmail timestamps"
+msgstr ""
+
 #: src/mn-main.c:116
 #, c-format
 msgid "Compiled-in features: %s\n"
 msgstr ""
 
-#: src/mn-main.c:175
+#: src/mn-main.c:176
 msgid "Enable informational output"
 msgstr ""
 
-#: src/mn-main.c:184
-msgid "List compiled-in features and exit"
+#: src/mn-main.c:185
+msgid "List the compiled-in features"
 msgstr ""
 
-#: src/mn-main.c:193
-msgid "Display the mail summary dialog"
+#: src/mn-main.c:194
+msgid "Display the main window"
 msgstr ""
 
-#: src/mn-main.c:202
+#: src/mn-main.c:203
 msgid "Display the properties dialog"
 msgstr ""
 
-#: src/mn-main.c:211
+#: src/mn-main.c:212
 msgid "Display the about dialog"
 msgstr ""
 
-#: src/mn-main.c:220
+#: src/mn-main.c:221
 msgid "Close the mail summary popup"
 msgstr ""
 
-#: src/mn-main.c:229
-msgid "Update the mail status"
-msgstr ""
-
-#: src/mn-main.c:238
+#: src/mn-main.c:239
 msgid "Report the mail status"
 msgstr ""
 
-#: src/mn-main.c:247
-msgid "Unset obsolete GConf configuration and exit"
+#: src/mn-main.c:248
+msgid "Unset obsolete GConf configuration"
 msgstr ""
 
 #.
 #. * We can't use mn_error_dialog() because gtk_init() has not been
 #. * called yet.
 #.
-#: src/mn-main.c:273
+#: src/mn-main.c:284
 msgid "multi-threading is not available"
 msgstr ""
 
-#: src/mn-main.c:320
+#: src/mn-main.c:338
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
 msgstr ""
 
-#: src/mn-main.c:325
+#: src/mn-main.c:344
+msgid "quitting Mail Notification"
+msgstr ""
+
+#: src/mn-main.c:348
+msgid "Mail Notification is not running"
+msgstr ""
+
+#: src/mn-main.c:355
 msgid "Unable to initialize the GnomeVFS library."
 msgstr ""
 
-#: src/mn-main.c:361
+#: src/mn-main.c:391
 msgid "updating the mail status"
 msgstr ""
 
-#: src/mn-main.c:379
+#: src/mn-main.c:409
 msgid "Mail Notification is already running"
 msgstr ""
 
-#: src/mn-main.c:386
+#: src/mn-main.c:417
 msgid ""
 "Bonobo could not locate the GNOME_MailNotification_Automation.server file. "
 "Please check your Mail Notification installation."
 msgstr ""
 
-#: src/mn-main.c:390
+#: src/mn-main.c:421
 msgid ""
 "Bonobo was unable to register the automation server. Please check your Mail "
 "Notification installation."
 msgstr ""
 
-#: src/mn-mbox-mailbox.gob:221
+#: src/mn-mbox-mailbox.gob:184
 #, c-format
-msgid "error while reading mailbox: %s"
+msgid "unable to open mailbox: %s"
 msgstr ""
 
-#: src/mn-mbox-mailbox.gob:230
-#, c-format
-msgid "unable to open mailbox: %s"
+#: src/mn-message-mime.c:105
+msgid "unable to parse MIME message"
+msgstr ""
+
+#: src/mn-message-view.gob:81
+msgid "You have no new mail."
 msgstr ""
 
-#: src/mn-message-box.gob:64
+#: src/mn-message-view.gob:321
 msgid "Unreadable message"
 msgstr ""
 
-#: src/mn-message-box.gob:69
+#: src/mn-message-view.gob:329
 msgid "From"
 msgstr ""
 
-#: src/mn-message-box.gob:70
+#: src/mn-message-view.gob:337
 msgid "Subject"
 msgstr ""
 
-#: src/mn-message-box.gob:75
+#: src/mn-message-view.gob:348
 msgid "Sent"
 msgstr ""
 
-#: src/mn-message-box.gob:192
+#: src/mn-message.gob:101
+msgid "Unknown"
+msgstr ""
+
+#: src/mn-message.gob:126
 #, c-format
 msgid "%i second ago"
 msgid_plural "%i seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-box.gob:196
+#: src/mn-message.gob:130
 #, c-format
-msgid "%i minute ago"
-msgid_plural "%i minutes ago"
+msgid "about %i minute ago"
+msgid_plural "about %i minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-box.gob:201
+#: src/mn-message.gob:135
 #, c-format
-msgid "%i hour ago"
-msgid_plural "%i hours ago"
+msgid "about %i hour ago"
+msgid_plural "about %i hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-box.gob:206
+#: src/mn-message.gob:140
 #, c-format
-msgid "%i day ago"
-msgid_plural "%i days ago"
+msgid "about %i day ago"
+msgid_plural "about %i days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-box.gob:211
+#: src/mn-message.gob:145
 #, c-format
-msgid "%i week ago"
-msgid_plural "%i weeks ago"
+msgid "about %i week ago"
+msgid_plural "about %i weeks ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-mime.c:105
-msgid "unable to parse MIME message"
-msgstr ""
-
-#: src/mn-message.gob:101
-msgid "Unknown"
-msgstr ""
-
-#: src/mn-mh-mailbox.gob:184
+#: src/mn-mh-mailbox.gob:147
 #, c-format
 msgid "error while reading .mh_sequences: %s"
 msgstr ""
 
-#: src/mn-mh-mailbox.gob:196
+#: src/mn-mh-mailbox.gob:157
 #, c-format
 msgid "unable to open .mh_sequences: %s"
 msgstr ""
@@ -1156,23 +1388,23 @@ msgstr ""
 msgid "detecting"
 msgstr ""
 
-#: src/mn-pi-mailbox-properties.gob:76
+#: src/mn-pi-mailbox-properties.gob:75
 msgid "_Hostname:"
 msgstr ""
 
-#: src/mn-pi-mailbox-properties.gob:94
+#: src/mn-pi-mailbox-properties.gob:93
 msgid "_Details"
 msgstr ""
 
-#: src/mn-pi-mailbox-properties.gob:106
+#: src/mn-pi-mailbox-properties.gob:105
 msgid "sta_ndard"
 msgstr ""
 
-#: src/mn-pi-mailbox-properties.gob:116
+#: src/mn-pi-mailbox-properties.gob:115
 msgid "_in-band SSL/TLS"
 msgstr ""
 
-#: src/mn-pi-mailbox-properties.gob:126
+#: src/mn-pi-mailbox-properties.gob:125
 msgid "SSL/TLS on sepa_rate port"
 msgstr ""
 
@@ -1194,77 +1426,77 @@ msgstr ""
 msgid "The port number of the POP3 server"
 msgstr ""
 
-#: src/mn-pop3-mailbox.gob:273
+#: src/mn-pop3-mailbox.gob:266
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr ""
 
-#: src/mn-pop3-mailbox.gob:590
+#: src/mn-pop3-mailbox.gob:569
 msgid "unknown error"
 msgstr ""
 
-#: src/mn-pop3-mailbox.gob:729
+#: src/mn-pop3-mailbox.gob:656
 #, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
 msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-pop3-mailbox.gob:893
+#: src/mn-pop3-mailbox.gob:849
 msgid "server does not support APOP authentication"
 msgstr ""
 
-#: src/mn-pop3-mailbox.gob:922
+#: src/mn-pop3-mailbox.gob:884
 msgid "falling back to APOP authentication"
 msgstr ""
 
-#: src/mn-pop3-mailbox.gob:927
+#: src/mn-pop3-mailbox.gob:889
 msgid "falling back to USER/PASS authentication"
 msgstr ""
 
-#: src/mn-properties.c:193
+#: src/mn-properties-dialog.c:218
 msgid "top left"
 msgstr ""
 
-#: src/mn-properties.c:194
+#: src/mn-properties-dialog.c:219
 msgid "top right"
 msgstr ""
 
-#: src/mn-properties.c:195
+#: src/mn-properties-dialog.c:220
 msgid "bottom left"
 msgstr ""
 
-#: src/mn-properties.c:196
+#: src/mn-properties-dialog.c:221
 msgid "bottom right"
 msgstr ""
 
-#: src/mn-properties.c:287
+#: src/mn-properties-dialog.c:323
 msgid "No mailbox selected."
 msgstr ""
 
-#: src/mn-properties.c:292
+#: src/mn-properties-dialog.c:328
 #, c-format
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-shell.gob:93
+#: src/mn-shell.gob:96
 msgid "You have new mail."
 msgstr ""
 
-#: src/mn-shell.gob:360
+#: src/mn-shell.gob:361
 msgid "Mailboxes Having New Mail"
 msgstr ""
 
-#: src/mn-shell.gob:362
+#: src/mn-shell.gob:382
 msgid "Errors"
 msgstr ""
 
-#: src/mn-shell.gob:364
+#: src/mn-shell.gob:403
 msgid "Unsupported Mailboxes"
 msgstr ""
 
-#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:418
 msgid "Mail Summary"
 msgstr ""
 
@@ -1282,20 +1514,20 @@ msgid "Select _All"
 msgstr ""
 
 #: src/mn-stock.c:29
-msgid "_Mail Summary"
+msgid "Leave Fullscreen"
 msgstr ""
 
-#: src/mn-sylpheed-mailbox.gob:119
+#: src/mn-sylpheed-mailbox.gob:113
 #, c-format
 msgid "unable to open folder: %s"
 msgstr ""
 
-#: src/mn-sylpheed-mailbox.gob:165
+#: src/mn-sylpheed-mailbox.gob:147
 #, c-format
 msgid "unable to close folder: %s"
 msgstr ""
 
-#: src/mn-sylpheed-mailbox.gob:168
+#: src/mn-sylpheed-mailbox.gob:150
 #, c-format
 msgid "error while reading folder: %s"
 msgstr ""
@@ -1323,66 +1555,74 @@ msgstr ""
 msgid "unsupported"
 msgstr ""
 
-#: src/mn-util.c:233
+#: src/mn-util.c:245
 #, c-format
 msgid "error loading image: %s"
 msgstr ""
 
-#: src/mn-util.c:271
+#: src/mn-util.c:276
 #, c-format
 msgid "widget \"%s\" not found in interface \"%s\""
 msgstr ""
 
-#: src/mn-util.c:385
+#: src/mn-util.c:390
 msgid "received an invalid URI list"
 msgstr ""
 
-#: src/mn-util.c:421
+#: src/mn-util.c:426
 msgid "received an invalid Mozilla URL"
 msgstr ""
 
-#: src/mn-util.c:514
+#: src/mn-util.c:519
 msgid "Unable to display help"
 msgstr ""
 
-#: src/mn-util.c:528
+#: src/mn-util.c:533
 #, c-format
 msgid "Unable to create a thread: %s."
 msgstr ""
 
-#: src/mn-util.c:705
+#: src/mn-util.c:626
 msgid "_Do not show this message again"
 msgstr ""
 
-#: src/mn-util.c:789
+#: src/mn-util.c:710
 msgid "A fatal error has occurred in Mail Notification"
 msgstr ""
 
-#: src/mn-util.c:804
+#: src/mn-util.c:725
 #, c-format
 msgid "unable to get current time: %s"
 msgstr ""
 
-#: src/mn-util.c:906
+#: src/mn-util.c:787
 #, c-format
 msgid "invalid signal specification \"%s\""
 msgstr ""
 
-#: src/mn-util.c:945
+#: src/mn-util.c:826
 msgid "A command error has occurred in Mail Notification"
 msgstr ""
 
-#: src/mn-util.c:946
+#: src/mn-util.c:827
 #, c-format
 msgid "Unable to execute \"%s\": %s."
 msgstr ""
 
 #: ui/authentication.glade.h:1
-msgid "*"
+msgid "_Authenticate"
 msgstr ""
 
-#: ui/authentication.glade.h:2
-msgid "_Authenticate"
+#: ui/edit-toolbars.glade.h:1
+msgid "Edit Toolbars"
+msgstr ""
+
+#: ui/edit-toolbars.glade.h:2
+msgid "_Add a New Toolbar"
+msgstr ""
+
+#: ui/edit-toolbars.glade.h:3
+msgid "_Use Default"
 msgstr ""
 
 #: ui/mailbox-properties.glade.h:1
@@ -1390,31 +1630,31 @@ msgid "_Mailbox type:"
 msgstr ""
 
 #: ui/properties.glade.h:1
-msgid "    "
+msgid "<span weight=\"bold\">Commands</span>"
 msgstr ""
 
 #: ui/properties.glade.h:2
-msgid "<span weight=\"bold\">Commands</span>"
+msgid "<span weight=\"bold\">Double-click Action</span>"
 msgstr ""
 
 #: ui/properties.glade.h:3
-msgid "<span weight=\"bold\">Double-click Action</span>"
+msgid "<span weight=\"bold\">Fonts</span>"
 msgstr ""
 
 #: ui/properties.glade.h:4
-msgid "<span weight=\"bold\">Fonts</span>"
+msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
 #: ui/properties.glade.h:5
-msgid "<span weight=\"bold\">General</span>"
+msgid "<span weight=\"bold\">Mailbox List</span>"
 msgstr ""
 
 #: ui/properties.glade.h:6
-msgid "<span weight=\"bold\">Mailbox List</span>"
+msgid "<span weight=\"bold\">Position</span>"
 msgstr ""
 
 #: ui/properties.glade.h:7
-msgid "<span weight=\"bold\">Position</span>"
+msgid "Co_ntents:"
 msgstr ""
 
 #: ui/properties.glade.h:8
@@ -1482,100 +1722,97 @@ msgid ""
 msgstr ""
 
 #: ui/properties.glade.h:23
-msgid "When _all mail is read:"
+msgid "Use these _fonts:"
 msgstr ""
 
 #: ui/properties.glade.h:24
-msgid "When _new mail arrives:"
+msgid "When _all mail is read:"
 msgstr ""
 
 #: ui/properties.glade.h:25
-msgid "Whether the status icon should blink on errors or not"
+msgid "When _new mail arrives:"
 msgstr ""
 
 #: ui/properties.glade.h:26
-msgid "Whether to automatically close the mail summary popup or not"
+msgid "Whether the status icon should blink on errors or not"
 msgstr ""
 
 #: ui/properties.glade.h:27
-msgid "Whether to display the mail summary in the status icon tooltip or not"
+msgid "Whether to automatically close the mail summary popup or not"
 msgstr ""
 
 #: ui/properties.glade.h:28
-msgid "Whether to display the mail summary popup when new mail arrives or not"
+msgid "Whether to display the mail summary in the status icon tooltip or not"
 msgstr ""
 
 #: ui/properties.glade.h:29
-msgid "Whether to hide previously displayed mail or not"
+msgid "Whether to display the mail summary popup when new mail arrives or not"
 msgstr ""
 
 #: ui/properties.glade.h:30
-msgid "Whether to run a command when all mail is read or not"
+msgid "Whether to hide previously displayed mail or not"
 msgstr ""
 
 #: ui/properties.glade.h:31
-msgid "Whether to run a command when new mail arrives or not"
+msgid "Whether to run a command when all mail is read or not"
 msgstr ""
 
 #: ui/properties.glade.h:32
-msgid "Whether to set a mail reader or not"
+msgid "Whether to run a command when new mail arrives or not"
 msgstr ""
 
 #: ui/properties.glade.h:33
-msgid ""
-"Whether to start Mail Notification when you log into your GNOME session or "
-"not"
+msgid "Whether to set a mail reader or not"
 msgstr ""
 
 #: ui/properties.glade.h:34
 msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
+"Whether to start Mail Notification when you log into your GNOME session or "
 "not"
 msgstr ""
 
 #: ui/properties.glade.h:35
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not"
+msgid "_Automatically close after:"
 msgstr ""
 
 #: ui/properties.glade.h:36
-msgid "_Automatically close after:"
+msgid "_Blink on errors"
 msgstr ""
 
 #: ui/properties.glade.h:37
-msgid "_Blink on errors"
+msgid "_Delay between mail checks:"
 msgstr ""
 
 #: ui/properties.glade.h:38
-msgid "_Contents font:"
+msgid "_Display the main window"
 msgstr ""
 
 #: ui/properties.glade.h:39
-msgid "_Delay between mail checks:"
+msgid "_Enable mail summary popup"
 msgstr ""
 
 #: ui/properties.glade.h:40
-msgid "_Display the mail summary dialog"
+msgid "_Launch the mail reader"
 msgstr ""
 
 #: ui/properties.glade.h:41
-msgid "_Enable mail summary popup"
+msgid "_Mail reader:"
 msgstr ""
 
 #: ui/properties.glade.h:42
-msgid "_Launch the mail reader"
+msgid "_Start Mail Notification on GNOME login"
 msgstr ""
 
 #: ui/properties.glade.h:43
-msgid "_Mail reader:"
+msgid "_Title:"
 msgstr ""
 
 #: ui/properties.glade.h:44
-msgid "_Start Mail Notification on GNOME login"
+msgid "_Update the mail status"
 msgstr ""
 
 #: ui/properties.glade.h:45
-msgid "_Title font:"
+msgid "_Use fonts from theme"
 msgstr ""
 
 #: ui/properties.glade.h:46
@@ -1604,7 +1841,7 @@ msgid ""
 "\n"
 "Mail Notification has been loaded successfully.\n"
 "\n"
-"Since this is the first time you run Mail Notification, you might want to "
+"Since this is the first time you run Mail Notification, you need to "
 "configure it.\n"
 "\n"
 "Note: this message will not be shown anymore. To configure Mail Notification "
diff --git a/po/pl.gmo b/po/pl.gmo
Binary files differ.
diff --git a/po/pl.po b/po/pl.po
@@ -4,16 +4,17 @@
 # This file is distributed under the same license as the
 # mail-notification package.
 #
+# Maurycy Pawłowski-Wieroński <maurycy@abstrakcja.pl>, 2005.
 # Tomasz Sarota-Raczek <tomasz.sarota.raczek@gmail.com>, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mail-notification 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-25 01:43+0100\n"
+"POT-Creation-Date: 2005-03-02 02:32+0100\n"
 "PO-Revision-Date: 2004-11-23 18:06+0100\n"
-"Last-Translator: Tomasz Sarota-Raczek <tomasz.sarota.raczek@gmail.com>\n"
-"Language-Team: Tomasz Sarota-Raczek <tomasz.sarota.raczek@gmail.com>\n"
+"Last-Translator: Maurycy Pawłowski-Wieroński <maurycy@abstrakcja.pl>\n"
+"Language-Team: Polish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,20 +29,20 @@ msgstr "Automatyzacja Zawiadomienia Pocztowego"
 msgid "Mail Notification automation factory"
 msgstr "Fabryka automatyzacji Zawiadomienia Pocztowego"
 
-#: data/mail-notification-properties.desktop.in.h:1
+#: data/mail-notification-properties.desktop.in.h:1 src/mn-main-window.c:145
 msgid "Configure Mail Notification"
-msgstr "Konfiguracja Zawiadomienia Pocztowego"
+msgstr "Konfiguracja zawiadomienia pocztowego"
 
 #: data/mail-notification-properties.desktop.in.h:2
 #: data/mail-notification.desktop.in.h:2
-#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:40
-#: src/mn-mail-icon.gob:194 src/mn-main.c:281
+#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:39
+#: src/mn-mail-icon.gob:224 src/mn-main.c:292 ui/main.glade.h:1
 msgid "Mail Notification"
-msgstr "Zawiadomienie Pocztowe"
+msgstr "Zawiadomienie pocztowe"
 
 #: data/mail-notification.desktop.in.h:1
 msgid "Get notified when new mail arrives"
-msgstr "Otrzymaj zawiadomienie po przyjściu nowej poczty"
+msgstr "Otrzymaj zawiadomienie po nadejściu nowej poczty"
 
 #: data/mail-notification.schemas.in.h:1
 msgid "Automatically close the mail summary popup"
@@ -49,7 +50,7 @@ msgstr "Automatycznie zamknij wyskakujące okienko streszczenia poczty"
 
 #: data/mail-notification.schemas.in.h:2
 msgid "Blink on errors"
-msgstr "Migaj na błędach"
+msgstr "Miganie przy błędach"
 
 #: data/mail-notification.schemas.in.h:3
 msgid "Delay between mail checks (minutes part)."
@@ -61,7 +62,7 @@ msgstr "Zwłoka pomiędzy sprawdzaniem poczty (sekundy)."
 
 #: data/mail-notification.schemas.in.h:5
 msgid "Display mail summary in tooltip"
-msgstr "Wyświetlij streszczenie poczty w etykietce narzędzi"
+msgstr "Wyświetlanie streszczenia poczty w obszarze powiadamiania"
 
 #: data/mail-notification.schemas.in.h:6
 msgid "Do not show the immediate notification error dialog"
@@ -84,94 +85,106 @@ msgid "Has already been run"
 msgstr "Polecenie już było wykonane"
 
 #: data/mail-notification.schemas.in.h:11
-msgid "Height of mail summary dialog"
+#, fuzzy
+msgid "Height of edit toolbars dialog"
 msgstr "Wysokość dialogu streszenia poczty"
 
 #: data/mail-notification.schemas.in.h:12
+#, fuzzy
+msgid "Height of main window"
+msgstr "Wysokość dialogu streszenia poczty"
+
+#: data/mail-notification.schemas.in.h:13
 msgid "Height of properties dialog"
 msgstr "Wysokość dialogu wlaściwości"
 
-#: data/mail-notification.schemas.in.h:13
+#: data/mail-notification.schemas.in.h:14
 msgid "Mail read command"
 msgstr "Rozkaz do przeczytania poczty"
 
-#: data/mail-notification.schemas.in.h:14
+#: data/mail-notification.schemas.in.h:15
 msgid "Mail reader command"
 msgstr "Rozkaz do uruchomienia czytnika poczty"
 
-#: data/mail-notification.schemas.in.h:15
+#: data/mail-notification.schemas.in.h:16
 msgid "Mail summary popup contents font"
 msgstr "Czcionka zawartości wyskakującego okienka streszczenia poczty"
 
-#: data/mail-notification.schemas.in.h:16
+#: data/mail-notification.schemas.in.h:17
+#, fuzzy
+msgid "Mail summary popup fonts aspect source"
+msgstr "Czcionka zawartości wyskakującego okienka streszczenia poczty"
+
+#: data/mail-notification.schemas.in.h:18
 msgid "Mail summary popup horizontal offset"
 msgstr "Poziomę przesunięcie wyskakującego okienka streszczenia poczty"
 
-#: data/mail-notification.schemas.in.h:17
+#: data/mail-notification.schemas.in.h:19
 msgid "Mail summary popup position"
 msgstr "Pozycja wyskakującego okienka streszczenia poczty"
 
-#: data/mail-notification.schemas.in.h:18
+#: data/mail-notification.schemas.in.h:20
 msgid "Mail summary popup title font"
 msgstr "Czcionka tytułu wyskakującego okienka streszczenia poczty"
 
-#: data/mail-notification.schemas.in.h:19
+#: data/mail-notification.schemas.in.h:21
 msgid "Mail summary popup vertical offset"
 msgstr "Pionowę przesunięcie wyskakującego okienka streszczenia poczty"
 
-#: data/mail-notification.schemas.in.h:20
+#: data/mail-notification.schemas.in.h:22
 msgid "Mailbox list"
 msgstr "Lista skrzynek pocztowych"
 
-#: data/mail-notification.schemas.in.h:21
+#: data/mail-notification.schemas.in.h:23
 msgid "Minutes between mail checks"
 msgstr "Ilość minut pomiędzy sprawdzaniem poczty"
 
-#: data/mail-notification.schemas.in.h:22
+#: data/mail-notification.schemas.in.h:24
 msgid "Minutes to wait before closing the mail summary popup"
 msgstr ""
 "Ile minut czekać przed zamknięciem wyskakującego okienka streszczenia poczty"
 
-#: data/mail-notification.schemas.in.h:23
+#: data/mail-notification.schemas.in.h:25
 msgid "New mail command"
 msgstr "Rozkaz do rozpoczęcia nowej poczty"
 
-#: data/mail-notification.schemas.in.h:24
+#: data/mail-notification.schemas.in.h:26
 msgid "Only display recent mail in mail summary popup"
 msgstr ""
 "Tylko wyświetlaj niedawną pocztę w wyskakującym okienku streszczenia poczty"
 
-#: data/mail-notification.schemas.in.h:25
+#: data/mail-notification.schemas.in.h:27
 msgid "Run a command when all mail is read"
 msgstr "Wykonaj rozkaz kiedy cała poczta jest przeczytana"
 
-#: data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:28
 msgid "Run a command when new mail arrives"
-msgstr "Wykonaj rozkaz po przyjściu nowej poczty"
+msgstr "Wykonaj rozkaz po nadejściu nowej poczty"
 
-#: data/mail-notification.schemas.in.h:27
+#: data/mail-notification.schemas.in.h:29
 msgid "Seconds between mail checks"
 msgstr "Sekundy pomiędzy sprawdzaniem poczty"
 
-#: data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:30
 msgid "Seconds to wait before closing the mail summary popup"
 msgstr ""
 "Ilość sekund do poczekania przed zamknięciem wyskakującego okienka "
 "streszczenia poczty"
 
-#: data/mail-notification.schemas.in.h:29
+#: data/mail-notification.schemas.in.h:31
 msgid "Set a mail reader"
 msgstr "Ustaw czytnika poczty"
 
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:32
+#, fuzzy
 msgid ""
 "The action to perform when the icon is double-clicked. Must be \"display-"
-"mail-summary\" or \"launch-mail-reader\"."
+"main-window\", \"launch-mail-reader\" or \"update-mail-status\"."
 msgstr ""
 "Akcja do wykonania kiedy ikon jest podwójnię kliknięty. Musi być \"display-"
 "mail-summary\" lub \"launch-mail-reader\"."
 
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:33
 msgid ""
 "The amount of time to wait before closing the mail summary popup (minutes "
 "part)."
@@ -179,7 +192,7 @@ msgstr ""
 "Ilość czasu do czekania przed zamknięciem wyskakującego okienka streszczenia "
 "poczty (minuty)."
 
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:34
 msgid ""
 "The amount of time to wait before closing the mail summary popup (seconds "
 "part)."
@@ -187,56 +200,71 @@ msgstr ""
 "Ilość czasu do czekania przed zamknięciem wyskakującego okienka streszczenia "
 "poczty (sekundy)."
 
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:35
+#, fuzzy
+msgid ""
+"The aspect source of the mail summary popup fonts. Must be \"theme\" or "
+"\"custom\"."
+msgstr ""
+"Pozycja wyskakującego okienka streszczenia poczty. Musi być \"top-left\", "
+"\"top-right\", \"bottom-left\" lub \"bottom-right\"."
+
+#: data/mail-notification.schemas.in.h:36
 msgid "The command to run to launch the mail reader."
 msgstr "Rozkaz do wykonania żeby uruchomić czytnika poczty."
 
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:37
 msgid "The command to run when all mail is read."
 msgstr "Rozkaz do wykonania kiedy cała poczta jest przeczytana."
 
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:38
 msgid "The command to run when new mail arrives."
-msgstr "Rozkaz do wykonania po przyjściu nowej poczty."
+msgstr "Polecenie do wykonania po nadejściu owej poczty."
 
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:39
 msgid "The custom font to use for the contents of the mail summary popup."
 msgstr ""
 "Niestandardowa czcionka użyta dla zawartości wyskakującego okienka "
 "streszczenia poczty."
 
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:40
 msgid "The custom font to use for the title of the mail summary popup."
 msgstr ""
 "Niestandardowa czcionka użyta dla tytułu wyskakującego okienka streszczenia "
 "poczty."
 
-#: data/mail-notification.schemas.in.h:38
-msgid "The height of the mail summary dialog in pixels."
+#: data/mail-notification.schemas.in.h:41
+#, fuzzy
+msgid "The height of the edit toolbars dialog in pixels."
 msgstr "Wysokość dialogu streszczenia poczty w pikselach."
 
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:42
+#, fuzzy
+msgid "The height of the main window in pixels."
+msgstr "Wysokość dialogu streszczenia poczty w pikselach."
+
+#: data/mail-notification.schemas.in.h:43
 msgid "The height of the properties dialog in pixels."
 msgstr "Wysokość dialogu właściwości w pikselach."
 
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:44
 msgid "The list of mailboxes to monitor."
 msgstr "Lista monitorowanych skrzynek pocztowych."
 
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:45
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
 msgstr "Lista zaufanych serwerów SSL/TSL (hostname:port) bez certyfikatu X509."
 
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:46
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
 msgstr ""
 "Lista zaufanych certyfikatów X509, przedstawionych przez ich MD5 odciski "
 "palców."
 
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:47
 msgid ""
 "The number of pixels to leave between the left or right side of the screen "
 "and the mail summary popup."
@@ -244,7 +272,7 @@ msgstr ""
 "Ilość pikselów do pozostawienia pomiędzy lewą lub prawą stroną ekranu i "
 "wyskakującym okienkiem streszczenia poczty."
 
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:48
 msgid ""
 "The number of pixels to leave between the top or bottom side of the screen "
 "and the mail summary popup."
@@ -252,7 +280,7 @@ msgstr ""
 "Ilość pikselów do pozostawienia pomiędzy górną lub dolną stroną ekranu i "
 "wyskakującym okienkiem streszczenia poczty."
 
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:49
 msgid ""
 "The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
 "\"bottom-left\" or \"bottom-right\"."
@@ -260,62 +288,86 @@ msgstr ""
 "Pozycja wyskakującego okienka streszczenia poczty. Musi być \"top-left\", "
 "\"top-right\", \"bottom-left\" lub \"bottom-right\"."
 
-#: data/mail-notification.schemas.in.h:46
-msgid "The width of the mail summary dialog in pixels."
+#: data/mail-notification.schemas.in.h:50
+#, fuzzy
+msgid ""
+"The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text\", "
+"\"both\" or \"both-horiz\"."
+msgstr ""
+"Pozycja wyskakującego okienka streszczenia poczty. Musi być \"top-left\", "
+"\"top-right\", \"bottom-left\" lub \"bottom-right\"."
+
+#: data/mail-notification.schemas.in.h:51
+#, fuzzy
+msgid "The width of the edit toolbars dialog in pixels."
 msgstr "Szerokość dialogu streszczenia poczty w pikselach."
 
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:52
+#, fuzzy
+msgid "The width of the main window in pixels."
+msgstr "Szerokość dialogu streszczenia poczty w pikselach."
+
+#: data/mail-notification.schemas.in.h:53
 msgid "The width of the properties dialog in pixels."
 msgstr "Szerokość dialogu właściwości w pikselach."
 
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:54
+msgid "Toolbars style"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:55
 msgid "Trusted servers list"
 msgstr "Lista zaufanych serwerów"
 
-#: data/mail-notification.schemas.in.h:49
-msgid "Use a custom font for the contents of the mail summary popup"
+#: data/mail-notification.schemas.in.h:56
+msgid "View statusbar"
 msgstr ""
-"Użyj niestandardową czcionkę dla zawartości wyskakującego okienka "
-"streszczenia poczty"
 
-#: data/mail-notification.schemas.in.h:50
-msgid "Use a custom font for the title of the mail summary popup"
+#: data/mail-notification.schemas.in.h:57
+msgid "View toolbars"
 msgstr ""
-"Użyj niestandardową czcionkę dla tytułu wyskakującego okienka streszczenia "
-"poczty"
 
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:58
 msgid "Whether Mail Notification has already been run or not."
-msgstr "Czy Zawiadomienie Pocztowe było już uruchomione czy nie."
+msgstr "Czy Zawiadomienie pocztowe było już uruchomione czy nie."
 
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:59
 msgid "Whether the status icon should blink on errors or not."
-msgstr "Czy ikon stanu ma migać na błędach czy nie."
+msgstr "Czy ikona statusu ma migać przy błędach"
 
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:60
+#, fuzzy
+msgid "Whether the statusbar should be visible or not."
+msgstr "Czy ikona statusu ma migać przy błędach"
+
+#: data/mail-notification.schemas.in.h:61
+#, fuzzy
+msgid "Whether the toolbars should be visible or not."
+msgstr "Czy skrzynka pocztowa była sprawdzona czy nie"
+
+#: data/mail-notification.schemas.in.h:62
 msgid "Whether to automatically close the mail summary popup or not."
 msgstr ""
-"Czy automatycznie zamknąć wyskakujące okienko streszczenia poczty czy nie."
+"Automatycznie zamyka okienko ze streszczeniem poczty po upływie zadanego "
+"czasu"
 
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:63
 msgid "Whether to display the mail summary in the status icon tooltip or not."
 msgstr ""
 "Czy wyświetlać streszczenie poczty w ikonie stanu etykiety narzędzi czy nie."
 
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:64
 msgid "Whether to display the mail summary popup when new mail arrives or not."
-msgstr ""
-"Czy wyświetlać wyskakujące okienko streszczenia poczty po przyjściu nowej "
-"poczty czy nie."
+msgstr "Wyświetl streszczenie poczty po nadejściu nowych listów"
 
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:65
 msgid ""
 "Whether to hide previously displayed mail in the mail summary popup or not."
 msgstr ""
 "Czy schować poprzednio wyświetloną pocztę w wyskakującym okienku "
 "streszczenia poczty czy nie."
 
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:66
 msgid ""
 "Whether to prevent the immediate notification error dialog from being "
 "displayed or not."
@@ -323,38 +375,29 @@ msgstr ""
 "Czy zapobiegać wyświetleniu dialogu błędowego natychmiastowego "
 "zawiadomieniaczy nie."
 
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:67
 msgid "Whether to run a command when all mail is read or not."
 msgstr "Czy wykonać rozkaz kiedy cała poczta jest przeczytanacza czy nie."
 
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:68
 msgid "Whether to run a command when new mail arrives or not."
 msgstr "Czy wykonać rozkaz kiedy przyjdzie nowa poczta czy nie."
 
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:69
 msgid "Whether to set a mail reader or not."
 msgstr "Czy ustawić czytnika poczty."
 
-#: data/mail-notification.schemas.in.h:61
-msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
-"not."
-msgstr ""
-"Czy użyć niestandardową czcionkę dla zawartości wyskakującego okienka "
-"streszczenia poczty czy nie."
-
-#: data/mail-notification.schemas.in.h:62
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not."
-msgstr ""
-"Czy użyć niestandardową czcionkę dla tytułu wyskakującego okienka "
-"streszczenia poczty czy nie."
+#: data/mail-notification.schemas.in.h:70
+#, fuzzy
+msgid "Width of edit toolbars dialog"
+msgstr "Szerokość dialogu streszczenia poczty"
 
-#: data/mail-notification.schemas.in.h:63
-msgid "Width of mail summary dialog"
+#: data/mail-notification.schemas.in.h:71
+#, fuzzy
+msgid "Width of main window"
 msgstr "Szerokość dialogu streszczenia poczty"
 
-#: data/mail-notification.schemas.in.h:64
+#: data/mail-notification.schemas.in.h:72
 msgid "Width of properties dialog"
 msgstr "Szerokość dialogu właściwości"
 
@@ -362,6 +405,20 @@ msgstr "Szerokość dialogu właściwości"
 msgid "New Mail"
 msgstr "Nowa Poczta"
 
+#: src/egg-editable-toolbar.c:536
+msgid "_Remove Toolbar"
+msgstr ""
+
+#: src/egg-toolbar-editor.c:558
+msgid "Separator"
+msgstr ""
+
+#: src/egg-toolbar-editor.c:588
+msgid ""
+"Drag an item onto the toolbars above to add it, from the toolbars in the "
+"items table to remove it."
+msgstr ""
+
 #: src/eggtrayicon.c:109
 msgid "Orientation"
 msgstr "Orientacja"
@@ -370,20 +427,20 @@ msgstr "Orientacja"
 msgid "The orientation of the tray."
 msgstr "Orientacja tacy."
 
-#: src/mn-about-dialog.gob:43
+#: src/mn-about-dialog.gob:42
 msgid "A Mail Notification Icon"
 msgstr "Ikon Zawiadomienia Pocztowego"
 
 #. translator: replace with your name and email
-#: src/mn-about-dialog.gob:47
+#: src/mn-about-dialog.gob:46
 msgid "Jean-Yves Lefort <jylefort@brutele.be>"
 msgstr "Tomasz Sarota-Raczek <tomasz.sarota.raczek@gmail.com>"
 
-#: src/mn-auth-combo-box.gob:101 src/mn-autodetect-mailbox-properties.gob:37
+#: src/mn-auth-combo-box.gob:102 src/mn-autodetect-mailbox-properties.gob:39
 msgid "<span style=\"italic\">autodetect</span>"
-msgstr "<span style=\"italic\">autoodkrycie</span>"
+msgstr "<span style=\"italic\">automatycznie</span>"
 
-#: src/mn-authenticated-mailbox.gob:80
+#: src/mn-authenticated-mailbox.gob:85
 #, c-format
 msgid ""
 "Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -391,17 +448,17 @@ msgid ""
 "\n"
 "Please re-enter your password."
 msgstr ""
-"Zawiadomienie Pocztowe nie mogło się wlogować w skrzynkę %s %s ponieważ było "
+"Zawiadomienie pocztowe nie mogło się wlogować w skrzynkę %s %s ponieważ było "
 "wpisanę niepoprawnę hasło.\n"
 "\n"
 "Proszę jeszcze raz wpisać hasło."
 
-#: src/mn-authenticated-mailbox.gob:81
+#: src/mn-authenticated-mailbox.gob:86
 #, c-format
 msgid "Enter your password for %s mailbox %s."
 msgstr "Wpisz twoje hasło dla skrzynki %s %s."
 
-#: src/mn-authenticated-mailbox.gob:132
+#: src/mn-authenticated-mailbox.gob:137
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Mail Notification requires a password</"
@@ -409,16 +466,16 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Zawiadomienie Pocztowe wymaga hasła</"
+"<span weight=\"bold\" size=\"larger\">Zawiadomienie pocztowe wymaga hasła</"
 "span>\n"
 "\n"
 "%s"
 
-#: src/mn-autodetect-mailbox-properties.gob:68
+#: src/mn-autodetect-mailbox-properties.gob:70
 msgid "_Location:"
 msgstr "_Lokacja:"
 
-#: src/mn-autodetect-mailbox-properties.gob:74
+#: src/mn-autodetect-mailbox-properties.gob:76
 msgid "_Browse..."
 msgstr "_Przeglądaj..."
 
@@ -426,7 +483,7 @@ msgstr "_Przeglądaj..."
 msgid "The URI of the mailbox"
 msgstr "URI skrzynki pocztowej"
 
-#: src/mn-autodetect-mailbox-properties.gob:118
+#: src/mn-autodetect-mailbox-properties.gob:123
 msgid "Select a File or Folder"
 msgstr "Wybierz Plik lub Teczkę"
 
@@ -447,7 +504,7 @@ msgstr "niezdolny rozwiązać %s: %s"
 #: src/mn-client-session.c:267
 #, c-format
 msgid "%s: unsupported address family"
-msgstr "%s: brak poparcia rodziny adresowej"
+msgstr "%s: nieobsługiwana rodzina adresów"
 
 #: src/mn-client-session.c:274
 #, c-format
@@ -523,7 +580,7 @@ msgid ""
 "to \"%s\". If you choose to connect to the server, this message will not be "
 "shown again."
 msgstr ""
-"Zawiadomienie Pocztowe nie mogło zaufać \"%s\" (%s). Jest możliwe że ktoś "
+"Zawiadomienie pocztowe nie mogło zaufać \"%s\" (%s). Jest możliwe że ktoś "
 "przechwyta twoje komunikacje żeby uzyskać twoją konfidencjalną informację.\n"
 "\n"
 "Powinieneś się tylko łączyć z serwerem jeśli jesteś pewny że jesteś "
@@ -562,80 +619,80 @@ msgstr "niezdolny do przeczytania z serwera: EOF"
 msgid "unable to decode data using SASL: %s"
 msgstr "niezdolny do rozszyfrowania danych używając SASL: %s"
 
-#: src/mn-client-session.c:746
+#: src/mn-client-session.c:743
 #, c-format
 msgid "unable to encode data using SASL: %s"
 msgstr "niezdolny do rozszyfrowania danych używając SASL: %s"
 
-#: src/mn-client-session.c:777 src/mn-client-session.c:784
+#: src/mn-client-session.c:774 src/mn-client-session.c:781
 #, c-format
 msgid "unable to write to server: %s"
 msgstr "niezdolny do pisania do serwera: %s"
 
-#: src/mn-client-session.c:782
+#: src/mn-client-session.c:779
 msgid "unable to write to server: EOF"
 msgstr "niezdolny do pisania do serwera: EOF"
 
-#: src/mn-client-session.c:814
+#: src/mn-client-session.c:811
 #, c-format
 msgid "unable to encode Base64: %s"
 msgstr "niezdolny do zakodowania Base64: %s"
 
-#: src/mn-client-session.c:925
+#: src/mn-client-session.c:922
 #, c-format
 msgid "unable to initialize the SASL library: %s"
 msgstr "niezdolny do inicjalizacji biblioteki SASL: %s"
 
-#: src/mn-client-session.c:934
+#: src/mn-client-session.c:931
 #, c-format
 msgid "unable to retrieve local address of socket: %s"
 msgstr "niezdolny odzyskać lokalnego adresu gniazda: %s"
 
-#: src/mn-client-session.c:940
+#: src/mn-client-session.c:937
 #, c-format
 msgid "unable to retrieve remote address of socket: %s"
 msgstr "niezdolny odzyskać odległego adresu gniazda: %s"
 
-#: src/mn-client-session.c:974
-#, c-format
-msgid "warning: unable to set SASL security properties: %s"
+#: src/mn-client-session.c:971
+#, fuzzy, c-format
+msgid "unable to set SASL security properties: %s"
 msgstr "ostrzeżenie: niezdolny ustawić właściwości ochronnę SASL: %s"
 
-#: src/mn-client-session.c:998
+#: src/mn-client-session.c:995
 msgid ""
 "unable to start SASL authentication: SASL asked for something we did not know"
 msgstr ""
 "niezdolny rozpocząć potwierdzenie tożsamości SASL: SASL zapytało się o coś "
 "czego nie wiemy"
 
-#: src/mn-client-session.c:1017
+#: src/mn-client-session.c:1014
 #, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr "niezdolny rozpocząć potwierdzenie tożsamości SASL: %s"
 
-#: src/mn-client-session.c:1021
+#: src/mn-client-session.c:1018
 #, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr "niezdolny do stworzenia połączenia SASL: %s"
 
-#: src/mn-client-session.c:1058
+#: src/mn-client-session.c:1055
 msgid "SASL asked for something we did not know, aborting SASL authentication"
 msgstr ""
 "SASL zapytał się o coś czego nie wiemy, przerywam potwierdzenie tożsamości "
 "SASL"
 
-#: src/mn-client-session.c:1075
+#: src/mn-client-session.c:1072
 #, c-format
 msgid "%s, aborting SASL authentication"
 msgstr "%s, przerywam potwierdzenie tożsamości SASL"
 
 #. compliance error
-#: src/mn-client-session.c:1080
+#: src/mn-client-session.c:1077
 #, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr "niezdolny rozszyfrować wprowadzenie Base64 od serweru : %s"
 
-#: src/mn-client-session.c:1083
+#: src/mn-client-session.c:1080
 msgid ""
 "the server sent a SASL challenge, but there was a pending initial SASL "
 "client response"
@@ -643,7 +700,7 @@ msgstr ""
 "serwer wysłał wyzwanie SASL, ale już była początkowa odpowiedź SASL od "
 "klienta."
 
-#: src/mn-client-session.c:1097
+#: src/mn-client-session.c:1094
 msgid ""
 "the server did not send a SASL challenge, but there was no pending initial "
 "SASL client response"
@@ -651,40 +708,50 @@ msgstr ""
 "serwer nie wysłał wyzwania SASL, ale nie było początkowej odpowiedź SASL od "
 "klienta."
 
-#: src/mn-client-session.c:1122
+#: src/mn-client-session.c:1119
 #, c-format
 msgid "a SASL security layer of strength factor %i is now active"
 msgstr "warstwa ochronna SASL czynnika mocy %i jest teraz aktywna"
 
 #. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: src/mn-client-session.c:1127
+#: src/mn-client-session.c:1124
 #, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr "niezdolny otrzymać właściwość SASL_MAXOUTBUF: %s"
 
-#: src/mn-client-session.c:1133
+#: src/mn-client-session.c:1130
 #, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr "ostrzeżenie: niezdolny otrzymać właściwość SASL_SSF: %s"
 
-#: src/mn-conf.c:145
+#: src/mn-conf.c:238
+#, fuzzy
+msgid "A directory creation error has occurred"
+msgstr "Wydarzył się błąd nasłuchowy"
+
+#: src/mn-conf.c:239
+#, fuzzy, c-format
+msgid "Unable to create directory \"%s\": %s."
+msgstr "Niezdolny do wykonania \"%s\": %s"
+
+#: src/mn-conf.c:313
 #, c-format
 msgid "recursively unsetting %s"
 msgstr "rekursywnie usuwam %s"
 
-#: src/mn-conf.c:149
+#: src/mn-conf.c:317
 msgid "syncing the GConf database"
 msgstr "synchronizacja bazy danych GConf"
 
-#: src/mn-conf.c:152
+#: src/mn-conf.c:320
 msgid "completed"
 msgstr "skończonę"
 
-#: src/mn-gmail-mailbox-properties.gob:77
+#: src/mn-gmail-mailbox-properties.gob:76
 msgid "Your Gmail username"
 msgstr "Twoję Gmail imię użytkownika"
 
-#: src/mn-gmail-mailbox-properties.gob:78
+#: src/mn-gmail-mailbox-properties.gob:77
 msgid ""
 "Your Gmail password (if left blank, you will be prompted for the password "
 "when needed)"
@@ -692,36 +759,60 @@ msgstr ""
 "Twoję Gmail hasło (jeśli pozostawione pustę, to będziesz zapytany o hasło "
 "wtedy kiedy będzie potrzebnę)"
 
-#: src/mn-gmail-mailbox.gob:82
+#: src/mn-gmail-mailbox.gob:86
 msgid "libsoup has not been compiled with SSL/TLS support"
 msgstr "libsoup nie było kompilowanę z poparciem SSL/TLS"
 
-#: src/mn-gmail-mailbox.gob:160
+#: src/mn-gmail-mailbox.gob:164
 #, c-format
 msgid "unable to parse URI \"%s\""
 msgstr "niezdolny wykonać rozbiór URI \"%s\""
 
-#: src/mn-gmail-mailbox.gob:214
+#: src/mn-gmail-mailbox.gob:217
+msgid "received non-UTF-8 data from server"
+msgstr ""
+
+#: src/mn-gmail-mailbox.gob:224
 #, c-format
 msgid "unable to transfer data: %s"
 msgstr "niezdolny do przesłania danych: %s"
 
-#: src/mn-gmail-mailbox.gob:335
+#: src/mn-gmail-mailbox.gob:345
 msgid "logging in"
 msgstr "logowanie"
 
-#: src/mn-gmail-mailbox.gob:413
+#: src/mn-gmail-mailbox.gob:423
 msgid "login failed"
 msgstr "nieudanę logowanie"
 
-#: src/mn-gmail-mailbox.gob:488
+#: src/mn-gmail-mailbox.gob:496
 msgid "searching for unread mail"
 msgstr "szukam nieprzeczytanej poczty"
 
 #: src/mn-gmail-mailbox.gob:527
+#, fuzzy
+msgid "unable to initialize the ICU library"
+msgstr "niezdolny do inicjalizacji biblioteki SASL: %s"
+
+#: src/mn-gmail-mailbox.gob:554
 msgid "unable to parse Gmail data"
 msgstr "niezdolny wykonać rozbioru danych Gmail"
 
+#: src/mn-gmail-mailbox.gob:891
+#, fuzzy, c-format
+msgid "unable to open calendar: %s"
+msgstr "niezdolny otworzyć teczkę: %s"
+
+#: src/mn-gmail-mailbox.gob:899
+#, fuzzy, c-format
+msgid "unable to set calendar time: %s"
+msgstr "niezdolny otrzymać aktualny czas: %s"
+
+#: src/mn-gmail-mailbox.gob:968
+#, fuzzy, c-format
+msgid "unable to get calendar time: %s"
+msgstr "niezdolny otrzymać aktualny czas: %s"
+
 #: src/mn-gmime-stream-vfs.gob:49
 #, c-format
 msgid "unable to read %s: %s"
@@ -747,19 +838,19 @@ msgstr "niezdolny opisać pozycję %s: %s"
 msgid "unable to close %s: %s"
 msgstr "niezdolny zamknąć %s: %s"
 
-#: src/mn-imap-mailbox-properties.gob:94
+#: src/mn-imap-mailbox-properties.gob:95
 msgid "Mailbox:"
 msgstr "Skrzynka pocztowa:"
 
-#: src/mn-imap-mailbox-properties.gob:98
+#: src/mn-imap-mailbox-properties.gob:99
 msgid "in_box"
 msgstr "_skrzynka odbiorcza"
 
-#: src/mn-imap-mailbox-properties.gob:109
+#: src/mn-imap-mailbox-properties.gob:110
 msgid "oth_er:"
 msgstr "innę:"
 
-#: src/mn-imap-mailbox-properties.gob:121
+#: src/mn-imap-mailbox-properties.gob:122
 msgid "U_se idle mode if possible"
 msgstr "Użyj bezczynny tryb jeśli to jest możliwę"
 
@@ -792,103 +883,101 @@ msgstr "Imię skrzynki pocztowej"
 msgid "If possible, whether to use idle mode or not"
 msgstr "Jeśli możliwę, czy użyć bezczynny tryb czy nie"
 
-#: src/mn-imap-mailbox.gob:166 src/mn-pop3-mailbox.gob:143
+#: src/mn-imap-mailbox.gob:156 src/mn-pop3-mailbox.gob:136
 msgid "SSL/TLS support has not been compiled in"
-msgstr "Poparcię SSL/TSL nie zostało wkompilowanę"
+msgstr "Protokół SSL/TLS nie jest obsługiwany"
 
-#: src/mn-imap-mailbox.gob:246
+#: src/mn-imap-mailbox.gob:236
 msgid "server did not send capabilities"
 msgstr "serwer nie wysłał możliwości"
 
-#: src/mn-imap-mailbox.gob:418
+#: src/mn-imap-mailbox.gob:408
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
 msgstr ""
 "serwer reklamował LOGINDISABLED, bez używania potwierdzenia tożsamości LOGIN"
 
-#: src/mn-imap-mailbox.gob:419
+#: src/mn-imap-mailbox.gob:409
 msgid "unable to login"
 msgstr "niezdolny do logowania"
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:571
+#: src/mn-imap-mailbox.gob:542
 msgid "server did not send search results"
 msgstr "serwer nie wysłał wyników poszukiwania"
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:651
+#: src/mn-imap-mailbox.gob:617
 msgid "server did not send all the messages we requested"
 msgstr "serwer nie wysłał wszystkich wiadomości o które prosiliśmy"
 
-#: src/mn-imap-mailbox.gob:700
+#: src/mn-imap-mailbox.gob:671
 msgid "unable to fetch message"
 msgstr "niezdolny do sprowadzenia wiadomości"
 
-#. compliance error
-#: src/mn-imap-mailbox.gob:818
-msgid "server did not send status"
-msgstr "serwer nie wysłał stanu"
-
-#: src/mn-imap-mailbox.gob:1096 src/mn-pop3-mailbox.gob:972
+#: src/mn-imap-mailbox.gob:1006 src/mn-pop3-mailbox.gob:927
 msgid "unknown server error"
 msgstr "nieznany błąd serweru"
 
-#: src/mn-imap-mailbox.gob:1198 src/mn-pop3-mailbox.gob:227
+#: src/mn-imap-mailbox.gob:1108 src/mn-pop3-mailbox.gob:220
 msgid "server does not support in-band SSL/TLS"
 msgstr "serwer nie popiera wewnątrzpasmowego SSL/TSL"
 
-#: src/mn-imap-mailbox.gob:1217 src/mn-pop3-mailbox.gob:885
+#: src/mn-imap-mailbox.gob:1127 src/mn-pop3-mailbox.gob:837
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
-msgstr ""
-"mechanizm potwierdzenia tożsamości SASL był wybrany ale poparcię SSL/TSL nie "
-"zostało wkompilowanę"
+msgstr "wybrany został nieobsługiwany mechanizm potwierdzania tożsamości SASL"
 
-#: src/mn-imap-mailbox.gob:1225 src/mn-pop3-mailbox.gob:897
+#: src/mn-imap-mailbox.gob:1137 src/mn-pop3-mailbox.gob:857
 #, c-format
 msgid "unknown authentication mechanism \"%s\""
 msgstr "nieznany mechanizm potwierdzenia tożsamości \"%s\""
 
-#: src/mn-imap-mailbox.gob:1246
+#: src/mn-imap-mailbox.gob:1160
 msgid "falling back to IMAP LOGIN authentication"
-msgstr "wycofanię do potwierdzenia tożsamości IMAP LOGIN"
+msgstr "powrót do potwierdzenia tożsamości IMAP LOGIN"
 
-#: src/mn-imap-mailbox.gob:1257 src/mn-pop3-mailbox.gob:938
+#: src/mn-imap-mailbox.gob:1172 src/mn-pop3-mailbox.gob:901
 msgid "authentication failed"
-msgstr "potwierdzenie tożsamości doznało niepowodzenia"
+msgstr "logowanie nie udało się"
 
-#: src/mn-mail-icon.gob:92 ui/summary-dialog.glade.h:2
-msgid "_Launch Mail Reader"
-msgstr "_Uruchom Czytnik Poczty"
+#: src/mn-mail-icon.gob:91
+msgid "Main _Window"
+msgstr ""
+
+#: src/mn-mail-icon.gob:92 src/mn-main-window.c:101
+#, fuzzy
+msgid "_Mail Reader"
+msgstr "C_zytnik poczty:"
 
-#: src/mn-mail-icon.gob:93 ui/summary-dialog.glade.h:3
+#: src/mn-mail-icon.gob:93 src/mn-main-window.c:109
 msgid "_Update"
-msgstr "_Udoskonalenie"
+msgstr "_Odśwież"
 
 #: src/mn-mail-icon.gob:99
 msgid "R_emove From Notification Area"
-msgstr "U_suń z Przestrzeni Zawiadomienia"
+msgstr "U_suń z obszaru powiadomienia"
 
-#: src/mn-mailbox-properties-dialog.c:109
+#: src/mn-mailbox-properties-dialog.c:156
 msgid "Add a Mailbox"
-msgstr "Dodaj Skrzynkę Pocztową"
+msgstr "Dodaj skrzynkę pocztową"
 
-#: src/mn-mailbox-properties-dialog.c:328
+#: src/mn-mailbox-properties-dialog.c:325
 #, c-format
 msgid "%s Properties"
 msgstr "Właściwości %s"
 
-#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:4
+#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:3
 msgid "_Username:"
-msgstr "_Imię użytkownika:"
+msgstr "_Użytkownik:"
 
-#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:3
+#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:2
 msgid "_Password:"
 msgstr "_Hasło:"
 
 #: src/mn-mailbox-properties-util.c:154
 msgid "Connection type:"
-msgstr "Rodzaj połączenia:"
+msgstr "Konfiguracja serwera:"
 
 #: src/mn-mailbox-properties-util.c:161
 msgid "Port:"
@@ -896,7 +985,7 @@ msgstr "Port:"
 
 #: src/mn-mailbox-properties-util.c:189
 msgid "_Authentication mechanism:"
-msgstr "Mechanizm potwierdzenia tożsamości:"
+msgstr "Uwierzytelnianie:"
 
 #: src/mn-mailbox-properties.c:63
 msgid "Label"
@@ -922,61 +1011,57 @@ msgstr "Skończonę"
 msgid "Whether the properties are completely filled or not"
 msgstr "Czy właściwości są całkowicię wypełnione czy nie"
 
-#: src/mn-mailbox-view.gob:263 src/mn-message-box.gob:61
+#: src/mn-mailbox-view.gob:271 src/mn-message-view.gob:312
 msgid "Mailbox"
 msgstr "Skrzynka pocztowa"
 
 #. format column
-#: src/mn-mailbox-view.gob:279
+#: src/mn-mailbox-view.gob:287
 msgid "Format"
 msgstr "Format"
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "Unable to add mailbox"
 msgstr "Niezdolny dodać skrzynkę pocztową"
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "The mailbox is already in the list."
 msgstr "Skrzynka pocztowa już jest w spisie."
 
-#: src/mn-mailbox.gob:130
+#: src/mn-mailbox.gob:131
 msgid "The mailbox URI"
 msgstr "URI skrzynki pocztowej"
 
-#: src/mn-mailbox.gob:141
+#: src/mn-mailbox.gob:142
 msgid "The mailbox human-readable name"
 msgstr "Ludzko-czytelne imię skrzynki pocztowej"
 
-#: src/mn-mailbox.gob:145
+#: src/mn-mailbox.gob:146
 msgid "Whether the mailbox has to be polled or not"
 msgstr "Czy skrzynka pocztowa była sprawdzona czy nie"
 
-#: src/mn-mailbox.gob:151
-msgid "Whether the mailbox has new mail or not"
-msgstr "Czy skrzynka pocztowa ma nową pocztę czy nie"
-
-#: src/mn-mailbox.gob:156
+#: src/mn-mailbox.gob:152
 msgid "The list of new and unread MNMessage objects"
 msgstr "Spis przeczytanych i nie przeczytanych obiektów MNMessage"
 
-#: src/mn-mailbox.gob:210
+#: src/mn-mailbox.gob:206
 msgid "The mailbox error, if any"
 msgstr "Błąd skrzynki pocztowej, jeżeli wszelki"
 
-#: src/mn-mailbox.gob:309
+#: src/mn-mailbox.gob:305
 msgid "does not exist"
 msgstr "nie istnieje"
 
-#: src/mn-mailbox.gob:341
+#: src/mn-mailbox.gob:337
 msgid "unknown format"
 msgstr "nieznany format"
 
-#: src/mn-mailbox.gob:407
-#, c-format
-msgid "unable to enable immediate notification for %s: %s"
+#: src/mn-mailbox.gob:403
+#, fuzzy, c-format
+msgid "unable to enable immediate notification: %s"
 msgstr "niezdolny umożliwić natychmiastowę zawiadomienie dla %s: %s"
 
-#: src/mn-mailbox.gob:425
+#: src/mn-mailbox.gob:421
 #, c-format
 msgid ""
 "As a fallback, they will be checked every %i second (this delay is "
@@ -994,7 +1079,7 @@ msgstr[2] ""
 "Pod reżimem awaryjnym, one będą sprawdzanę co każdę %i sekundy (ta zwłoka "
 "może być skonfigurowana w Dialogu Właściowści)."
 
-#: src/mn-mailbox.gob:436
+#: src/mn-mailbox.gob:432
 #, c-format
 msgid ""
 "As a fallback, they will be checked every %i minute (this delay is "
@@ -1012,7 +1097,7 @@ msgstr[2] ""
 "Pod reżimem awaryjnym, one będą sprawdzanę co każdę %i minuty (ta zwłoka "
 "może być skonfigurowana w Dialogu Właściowści)."
 
-#: src/mn-mailbox.gob:447
+#: src/mn-mailbox.gob:443
 #, c-format
 msgid ""
 "As a fallback, they will be checked approximately every %i minute (this "
@@ -1030,133 +1115,307 @@ msgstr[2] ""
 "Pod reżimem awaryjnym, one będą sprawdzanę co mniej więcej każdę %i minuty "
 "(ta zwłoka może być skonfigurowana w Dialogu Właściowści)."
 
-#: src/mn-mailbox.gob:463
+#: src/mn-mailbox.gob:459
 msgid "A monitoring error has occurred"
 msgstr "Wydarzył się błąd nasłuchowy"
 
-#: src/mn-mailbox.gob:464
+#: src/mn-mailbox.gob:460
 #, c-format
 msgid ""
 "Mail Notification was unable to enable immediate notification for one or "
 "more mailboxes. %s"
 msgstr ""
-"Zawiadomienie Pocztowe było niezdolnę umożliwić natychmiastowę zawiadomienie "
+"Zawiadomienie pocztowe było niezdolnę umożliwić natychmiastowę zawiadomienie "
 "jednej albo większej ilość skrzynek pocztowych. %s"
 
-#: src/mn-mailboxes.gob:142
+#: src/mn-mailboxes.gob:130
 msgid "Whether one or more of the mailboxes has to be polled"
 msgstr "Czy jedna lub więcej szkrzynek pocztowych była sprawdzona czy nie"
 
-#: src/mn-mailboxes.gob:272
+#: src/mn-mailboxes.gob:260
 #, c-format
 msgid "%s is unsupported: %s"
-msgstr "%s nie ma poparcia: %s"
+msgstr "%s jest nieobsługiwane: %s"
 
-#: src/mn-mailboxes.gob:304
-#, c-format
-msgid "%s has new mail"
-msgstr "%s ma nową pocztę"
-
-#: src/mn-mailboxes.gob:304
-#, c-format
-msgid "%s has no new mail"
-msgstr "%s nie ma nowej poczty"
+#: src/mn-mailboxes.gob:290
+#, fuzzy, c-format
+msgid "%s has %i new message"
+msgid_plural "%s has %i new messages"
+msgstr[0] "%s ma nową pocztę"
+msgstr[1] "%s ma nową pocztę"
+msgstr[2] "%s ma nową pocztę"
 
-#: src/mn-mailboxes.gob:330
+#: src/mn-mailboxes.gob:307
 #, c-format
 msgid "%s reported an error: %s"
 msgstr "%s zgłosiło błąd: %s"
 
-#: src/mn-maildir-mailbox.gob:119
+#: src/mn-maildir-mailbox.gob:112
 #, c-format
 msgid "unable to open folder \"new\": %s"
 msgstr "niezdolny otworzyć teczkę \"new\": %s"
 
-#: src/mn-maildir-mailbox.gob:161
+#: src/mn-maildir-mailbox.gob:141
 #, c-format
 msgid "unable to close folder \"new\": %s"
 msgstr "niezdolny zamknąć teczkę \"new\": %s"
 
-#: src/mn-maildir-mailbox.gob:164
+#: src/mn-maildir-mailbox.gob:144
 #, c-format
 msgid "error while reading folder \"new\": %s"
 msgstr "błąd podczas czytania teczki \"new\": %s"
 
+#. Toplevel
+#: src/mn-main-window.c:92
+#, fuzzy
+msgid "_Mail"
+msgstr "Skrzynka pocztowa"
+
+#: src/mn-main-window.c:93
+msgid "_Edit"
+msgstr ""
+
+#: src/mn-main-window.c:94
+msgid "_View"
+msgstr ""
+
+#: src/mn-main-window.c:95
+msgid "_Help"
+msgstr ""
+
+#: src/mn-main-window.c:103
+#, fuzzy
+msgid "Launch the mail reader"
+msgstr "U_ruchom czytnik poczty"
+
+#. Reload
+#: src/mn-main-window.c:111 src/mn-main.c:230
+msgid "Update the mail status"
+msgstr "Odśwież stan poczty"
+
+#: src/mn-main-window.c:117
+msgid "_Close"
+msgstr ""
+
+#: src/mn-main-window.c:119
+msgid "Close this window"
+msgstr ""
+
+#: src/mn-main-window.c:125
+msgid "_Quit"
+msgstr ""
+
+#: src/mn-main-window.c:127 src/mn-main.c:257
+#, fuzzy
+msgid "Quit Mail Notification"
+msgstr "Zawiadomienie pocztowe"
+
+#: src/mn-main-window.c:135 src/mn-main-window.c:183
+msgid "_Toolbars"
+msgstr ""
+
+#: src/mn-main-window.c:137
+msgid "Customize the toolbars"
+msgstr ""
+
+#: src/mn-main-window.c:143
+msgid "_Preferences"
+msgstr ""
+
+#: src/mn-main-window.c:153
+msgid "Toolbars Styl_e"
+msgstr ""
+
+#: src/mn-main-window.c:155
+msgid "Customize the toolbars style"
+msgstr ""
+
+#: src/mn-main-window.c:163
+#, fuzzy
+msgid "_Contents"
+msgstr "_Wybór czcionki treści:"
+
+#: src/mn-main-window.c:165
+#, fuzzy
+msgid "Display help"
+msgstr "Niezdolny do wyświetlenia pomocy"
+
+#: src/mn-main-window.c:171
+msgid "_About"
+msgstr ""
+
+#: src/mn-main-window.c:173
+msgid "Display credits"
+msgstr ""
+
+#: src/mn-main-window.c:185
+msgid "Show or hide the toolbars"
+msgstr ""
+
+#: src/mn-main-window.c:192
+msgid "_Statusbar"
+msgstr ""
+
+#: src/mn-main-window.c:194
+msgid "Show or hide the statusbar"
+msgstr ""
+
+#: src/mn-main-window.c:205
+msgid "_Desktop Default"
+msgstr ""
+
+#: src/mn-main-window.c:207
+msgid "Set the toolbars style to the desktop default setting"
+msgstr ""
+
+#: src/mn-main-window.c:213
+msgid "I_cons Only"
+msgstr ""
+
+#: src/mn-main-window.c:215
+#, fuzzy
+msgid "Only display the toolbars icons"
+msgstr "Wyświetlanie tylko nieprzeczytanych listów"
+
+#: src/mn-main-window.c:221
+msgid "_Text Only"
+msgstr ""
+
+#: src/mn-main-window.c:223
+msgid "Only display the toolbars text"
+msgstr ""
+
+#: src/mn-main-window.c:229
+msgid "Text Belo_w Icons"
+msgstr ""
+
+#: src/mn-main-window.c:231
+msgid "Display the toolbars text below the icons"
+msgstr ""
+
+#: src/mn-main-window.c:237
+msgid "Text Be_side Icons"
+msgstr ""
+
+#: src/mn-main-window.c:239
+msgid "Display the toolbars text beside the icons"
+msgstr ""
+
+#: src/mn-main-window.c:363
+#, fuzzy, c-format
+msgid "unable to load menus.xml: %s"
+msgstr "niezdolny przeczytać %s: %s"
+
+#: src/mn-main-window.c:398
+#, fuzzy
+msgid "Help messages"
+msgstr "Nieczytalna wiadomość"
+
+#: src/mn-main-window.c:399
+msgid "Count messages"
+msgstr ""
+
+#: src/mn-main-window.c:503
+#, fuzzy, c-format
+msgid "%i new message"
+msgid_plural "%i new messages"
+msgstr[0] "Nieczytalna wiadomość"
+msgstr[1] "Nieczytalna wiadomość"
+msgstr[2] "Nieczytalna wiadomość"
+
+#: src/mn-main-window.c:540
+#, fuzzy
+msgid "unable to load toolbars.xml"
+msgstr "niezdolny zamknąć teczkę: %s"
+
 #: src/mn-main.c:99
 #, c-format
 msgid "Compiled-in mailbox backends: %s\n"
 msgstr "Wkompilowanę wewnętrzne cechy skrzynki pocztowej: %s\n"
 
+#: src/mn-main.c:113
+msgid "Gmail timestamps"
+msgstr ""
+
 #: src/mn-main.c:116
 #, c-format
 msgid "Compiled-in features: %s\n"
 msgstr "Wkompilowanę cechy: %s\n"
 
-#: src/mn-main.c:175
+#: src/mn-main.c:176
 msgid "Enable informational output"
 msgstr "Umożliw informacyjny wydruk"
 
-#: src/mn-main.c:184
-msgid "List compiled-in features and exit"
+#: src/mn-main.c:185
+#, fuzzy
+msgid "List the compiled-in features"
 msgstr "Wydrukuj spis wkompilowanych cech i zakończ"
 
-#: src/mn-main.c:193
-msgid "Display the mail summary dialog"
-msgstr "Wyświetlij dialog streszczenia poczty"
+#: src/mn-main.c:194
+#, fuzzy
+msgid "Display the main window"
+msgstr "Wyświetlij dialog \"O\""
 
-#: src/mn-main.c:202
+#: src/mn-main.c:203
 msgid "Display the properties dialog"
 msgstr "Wyświetlij dialog właściwości"
 
-#: src/mn-main.c:211
+#: src/mn-main.c:212
 msgid "Display the about dialog"
 msgstr "Wyświetlij dialog \"O\""
 
-#: src/mn-main.c:220
+#: src/mn-main.c:221
 msgid "Close the mail summary popup"
 msgstr "Zamknij wyskakujące okienko streszczenia poczty"
 
-#: src/mn-main.c:229
-msgid "Update the mail status"
-msgstr "Odśwież stan poczty"
-
-#: src/mn-main.c:238
+#: src/mn-main.c:239
 msgid "Report the mail status"
 msgstr "Zgłoś stan poczty"
 
-#: src/mn-main.c:247
-msgid "Unset obsolete GConf configuration and exit"
+#: src/mn-main.c:248
+#, fuzzy
+msgid "Unset obsolete GConf configuration"
 msgstr "Usuń przestarzałą konfigurację GConf i zakończ"
 
 #.
 #. * We can't use mn_error_dialog() because gtk_init() has not been
 #. * called yet.
 #.
-#: src/mn-main.c:273
+#: src/mn-main.c:284
 msgid "multi-threading is not available"
 msgstr "wielowątkowość nie jest dostępna "
 
-#: src/mn-main.c:320
+#: src/mn-main.c:338
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
 msgstr ""
 "Bonobo nie potrafiło znaleźć obiektu automatyzacyjnego. Proszę sprawdzić "
-"instalację Zawiadomienie Pocztowego"
+"instalację Zawiadomienie pocztowego"
+
+#: src/mn-main.c:344
+#, fuzzy
+msgid "quitting Mail Notification"
+msgstr "Zawiadomienie pocztowe"
+
+#: src/mn-main.c:348
+#, fuzzy
+msgid "Mail Notification is not running"
+msgstr "Zawiadomienie pocztowe jest już uruchomione."
 
-#: src/mn-main.c:325
+#: src/mn-main.c:355
 msgid "Unable to initialize the GnomeVFS library."
 msgstr "Niezdolny do inicjalizacji biblioteki GnomeVFS."
 
-#: src/mn-main.c:361
+#: src/mn-main.c:391
 msgid "updating the mail status"
 msgstr "odświeżanie stanu poczty"
 
-#: src/mn-main.c:379
+#: src/mn-main.c:409
 msgid "Mail Notification is already running"
-msgstr "Zawiadomienie Pocztowe jest już uruchomione."
+msgstr "Zawiadomienie pocztowe jest już uruchomione."
 
-#: src/mn-main.c:386
+#: src/mn-main.c:417
 msgid ""
 "Bonobo could not locate the GNOME_MailNotification_Automation.server file. "
 "Please check your Mail Notification installation."
@@ -1164,7 +1423,7 @@ msgstr ""
 "Bonobo nie mogło znaleźć pliku GNOME_MailNotification_Automation.server."
 "Proszę sprawdzić swoją instalację Zawiadomienia Pocztowego."
 
-#: src/mn-main.c:390
+#: src/mn-main.c:421
 msgid ""
 "Bonobo was unable to register the automation server. Please check your Mail "
 "Notification installation."
@@ -1172,33 +1431,41 @@ msgstr ""
 "Bonobo nie potrafiło zarejestrować serwera automatyzacyjnego. Proszę "
 "sprawdzić instalację Zawiadomienia Pocztowego"
 
-#: src/mn-mbox-mailbox.gob:221
-#, c-format
-msgid "error while reading mailbox: %s"
-msgstr "błąd podczas odczytywania skrzynki pocztowej: %s"
-
-#: src/mn-mbox-mailbox.gob:230
+#: src/mn-mbox-mailbox.gob:184
 #, c-format
 msgid "unable to open mailbox: %s"
 msgstr "niezdolny otworzyć skrzynkę pocztową: %s"
 
-#: src/mn-message-box.gob:64
+#: src/mn-message-mime.c:105
+msgid "unable to parse MIME message"
+msgstr "niezdolny do zrobienia rozbioru wiadomości MIME"
+
+#: src/mn-message-view.gob:81
+#, fuzzy
+msgid "You have no new mail."
+msgstr "Masz wiadomość!"
+
+#: src/mn-message-view.gob:321
 msgid "Unreadable message"
 msgstr "Nieczytalna wiadomość"
 
-#: src/mn-message-box.gob:69
+#: src/mn-message-view.gob:329
 msgid "From"
 msgstr "Od"
 
-#: src/mn-message-box.gob:70
+#: src/mn-message-view.gob:337
 msgid "Subject"
 msgstr "Temat"
 
-#: src/mn-message-box.gob:75
+#: src/mn-message-view.gob:348
 msgid "Sent"
 msgstr "Posłanę"
 
-#: src/mn-message-box.gob:192
+#: src/mn-message.gob:101
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: src/mn-message.gob:126
 #, c-format
 msgid "%i second ago"
 msgid_plural "%i seconds ago"
@@ -1206,52 +1473,44 @@ msgstr[0] "%i sekundę temu"
 msgstr[1] "%i sekund temu"
 msgstr[2] "%i sekundy temu"
 
-#: src/mn-message-box.gob:196
-#, c-format
-msgid "%i minute ago"
-msgid_plural "%i minutes ago"
+#: src/mn-message.gob:130
+#, fuzzy, c-format
+msgid "about %i minute ago"
+msgid_plural "about %i minutes ago"
 msgstr[0] "%i minutę temu"
 msgstr[1] "%i minut temu"
 msgstr[2] "%i minuty temu"
 
-#: src/mn-message-box.gob:201
-#, c-format
-msgid "%i hour ago"
-msgid_plural "%i hours ago"
+#: src/mn-message.gob:135
+#, fuzzy, c-format
+msgid "about %i hour ago"
+msgid_plural "about %i hours ago"
 msgstr[0] "%i godzinę temu"
 msgstr[1] "%i godzin temu"
 msgstr[2] "%i godziny temu"
 
-#: src/mn-message-box.gob:206
-#, c-format
-msgid "%i day ago"
-msgid_plural "%i days ago"
+#: src/mn-message.gob:140
+#, fuzzy, c-format
+msgid "about %i day ago"
+msgid_plural "about %i days ago"
 msgstr[0] "%i dzień temu"
 msgstr[1] "%i dni temu"
 msgstr[2] "%i dni temu"
 
-#: src/mn-message-box.gob:211
-#, c-format
-msgid "%i week ago"
-msgid_plural "%i weeks ago"
+#: src/mn-message.gob:145
+#, fuzzy, c-format
+msgid "about %i week ago"
+msgid_plural "about %i weeks ago"
 msgstr[0] "%i tydzień temu"
 msgstr[1] "%i tygodni temu"
 msgstr[2] "%i tygodnie temu"
 
-#: src/mn-message-mime.c:105
-msgid "unable to parse MIME message"
-msgstr "niezdolny do zrobienia rozbioru wiadomości MIME"
-
-#: src/mn-message.gob:101
-msgid "Unknown"
-msgstr "Nieznany"
-
-#: src/mn-mh-mailbox.gob:184
+#: src/mn-mh-mailbox.gob:147
 #, c-format
 msgid "error while reading .mh_sequences: %s"
 msgstr "błąd podczas czytania .mh_sequences: %s"
 
-#: src/mn-mh-mailbox.gob:196
+#: src/mn-mh-mailbox.gob:157
 #, c-format
 msgid "unable to open .mh_sequences: %s"
 msgstr "niezdolny do otwarcia .mh_sequences: %s"
@@ -1260,23 +1519,23 @@ msgstr "niezdolny do otwarcia .mh_sequences: %s"
 msgid "detecting"
 msgstr "odkrywanie"
 
-#: src/mn-pi-mailbox-properties.gob:76
+#: src/mn-pi-mailbox-properties.gob:75
 msgid "_Hostname:"
-msgstr "Imię komputera:"
+msgstr "Nazwa serwera:"
 
-#: src/mn-pi-mailbox-properties.gob:94
+#: src/mn-pi-mailbox-properties.gob:93
 msgid "_Details"
 msgstr "_Szczegóły"
 
-#: src/mn-pi-mailbox-properties.gob:106
+#: src/mn-pi-mailbox-properties.gob:105
 msgid "sta_ndard"
-msgstr "norma"
+msgstr "bez szyfrowania"
 
-#: src/mn-pi-mailbox-properties.gob:116
+#: src/mn-pi-mailbox-properties.gob:115
 msgid "_in-band SSL/TLS"
-msgstr "wewnątrzpasmowy SSL/TLS"
+msgstr "wewnątrzpasmowy TLS"
 
-#: src/mn-pi-mailbox-properties.gob:126
+#: src/mn-pi-mailbox-properties.gob:125
 msgid "SSL/TLS on sepa_rate port"
 msgstr "SSL/TLS na oddzielnym porcie"
 
@@ -1300,15 +1559,15 @@ msgstr ""
 msgid "The port number of the POP3 server"
 msgstr "Numer portu serweru POP3"
 
-#: src/mn-pop3-mailbox.gob:273
+#: src/mn-pop3-mailbox.gob:266
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr "nieważne argumenty do zdolności LOGIN-DELAY"
 
-#: src/mn-pop3-mailbox.gob:590
+#: src/mn-pop3-mailbox.gob:569
 msgid "unknown error"
 msgstr "nieznany błąd"
 
-#: src/mn-pop3-mailbox.gob:729
+#: src/mn-pop3-mailbox.gob:656
 #, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
 msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
@@ -1316,65 +1575,65 @@ msgstr[0] "honorujemy LOGIN-DELAY, śpimy przez %i sekundę"
 msgstr[1] "honorujemy LOGIN-DELAY, śpimy przez %i sekund"
 msgstr[2] "honorujemy LOGIN-DELAY, śpimy przez %i sekundy"
 
-#: src/mn-pop3-mailbox.gob:893
+#: src/mn-pop3-mailbox.gob:849
 msgid "server does not support APOP authentication"
 msgstr "serwer nie popiera potwierdzenia tożsamości APOP"
 
-#: src/mn-pop3-mailbox.gob:922
+#: src/mn-pop3-mailbox.gob:884
 msgid "falling back to APOP authentication"
 msgstr "wycofanię do potwierdzenia tożsamości APOP"
 
-#: src/mn-pop3-mailbox.gob:927
+#: src/mn-pop3-mailbox.gob:889
 msgid "falling back to USER/PASS authentication"
 msgstr "wycofanię do potwierdzenia tożsamości USER/PASS"
 
-#: src/mn-properties.c:193
+#: src/mn-properties-dialog.c:218
 msgid "top left"
-msgstr "lewy górny"
+msgstr "lewy górny róg ekranu"
 
-#: src/mn-properties.c:194
+#: src/mn-properties-dialog.c:219
 msgid "top right"
-msgstr "prawy górny"
+msgstr "prawy górny róg ekranu"
 
-#: src/mn-properties.c:195
+#: src/mn-properties-dialog.c:220
 msgid "bottom left"
-msgstr "lewy dolny"
+msgstr "lewy dolny róg ekranu"
 
-#: src/mn-properties.c:196
+#: src/mn-properties-dialog.c:221
 msgid "bottom right"
-msgstr "prawy dolny"
+msgstr "prawy dolny róg ekranu"
 
-#: src/mn-properties.c:287
+#: src/mn-properties-dialog.c:323
 msgid "No mailbox selected."
-msgstr "Żadna skrzynka pocztowa nie wybrana."
+msgstr "Żadna skrzynka pocztowa nie została wybrana."
 
-#: src/mn-properties.c:292
+#: src/mn-properties-dialog.c:328
 #, c-format
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
 msgstr[0] "%i skrzynka pocztowa wybrana"
-msgstr[1] "%i skrzynkek pocztowych wybranych"
+msgstr[1] "%i skrzynek pocztowych wybranych"
 msgstr[2] "%i skrzynki pocztowe wybranę"
 
-#: src/mn-shell.gob:93
+#: src/mn-shell.gob:96
 msgid "You have new mail."
-msgstr "Masz Nową Pocztę."
+msgstr "Masz wiadomość!"
 
-#: src/mn-shell.gob:360
+#: src/mn-shell.gob:361
 msgid "Mailboxes Having New Mail"
-msgstr "Skrzynki Pocztowę z Nową Pocztą"
+msgstr "Skrzynki pocztowe z nową pocztą"
 
-#: src/mn-shell.gob:362
+#: src/mn-shell.gob:382
 msgid "Errors"
 msgstr "Błędy"
 
-#: src/mn-shell.gob:364
+#: src/mn-shell.gob:403
 msgid "Unsupported Mailboxes"
-msgstr "Nie Popierane Skrzynki Pocztowe"
+msgstr "Nieskonfigurowane skrzynki pocztowe"
 
-#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:418
 msgid "Mail Summary"
-msgstr "Streszczenie Poczty"
+msgstr "Streszczenie poczty"
 
 #: src/mn-soup.c:140
 #, c-format
@@ -1390,27 +1649,27 @@ msgid "Select _All"
 msgstr "Wybierz _Wszystkie"
 
 #: src/mn-stock.c:29
-msgid "_Mail Summary"
-msgstr "_Streszczenie Poczty"
+msgid "Leave Fullscreen"
+msgstr ""
 
-#: src/mn-sylpheed-mailbox.gob:119
+#: src/mn-sylpheed-mailbox.gob:113
 #, c-format
 msgid "unable to open folder: %s"
 msgstr "niezdolny otworzyć teczkę: %s"
 
-#: src/mn-sylpheed-mailbox.gob:165
+#: src/mn-sylpheed-mailbox.gob:147
 #, c-format
 msgid "unable to close folder: %s"
 msgstr "niezdolny zamknąć teczkę: %s"
 
-#: src/mn-sylpheed-mailbox.gob:168
+#: src/mn-sylpheed-mailbox.gob:150
 #, c-format
 msgid "error while reading folder: %s"
 msgstr "błąd podczas czytania teczki: %s"
 
 #: src/mn-system-mailbox-properties.gob:34 src/mn-uri.gob:411
 msgid "System Mailbox"
-msgstr "Skrzynka Pocztowa Systemu"
+msgstr "Lokalna skrzynka"
 
 #: src/mn-system-mailbox-properties.gob:57
 #, c-format
@@ -1433,113 +1692,122 @@ msgstr "Powód z powodu którego skrzynka pocztowa nie jest popierana"
 
 #: src/mn-unsupported-mailbox.gob:40
 msgid "unsupported"
-msgstr "brak poparcia"
+msgstr "nieobsługiwany"
 
-#: src/mn-util.c:233
+#: src/mn-util.c:245
 #, c-format
 msgid "error loading image: %s"
 msgstr "błąd w ładowaniu obrazka: %s"
 
-#: src/mn-util.c:271
+#: src/mn-util.c:276
 #, c-format
 msgid "widget \"%s\" not found in interface \"%s\""
 msgstr "element \"%s\" nie mógł byc znaleziony w interfejsie \"%s\""
 
-#: src/mn-util.c:385
+#: src/mn-util.c:390
 msgid "received an invalid URI list"
 msgstr "otrzymano nieważną listę URIów"
 
-#: src/mn-util.c:421
+#: src/mn-util.c:426
 msgid "received an invalid Mozilla URL"
 msgstr "otrzymano nieważny Mozillowy URL"
 
-#: src/mn-util.c:514
+#: src/mn-util.c:519
 msgid "Unable to display help"
 msgstr "Niezdolny do wyświetlenia pomocy"
 
-#: src/mn-util.c:528
+#: src/mn-util.c:533
 #, c-format
 msgid "Unable to create a thread: %s."
 msgstr "Niezdolny do stworzenia wątku: %s."
 
-#: src/mn-util.c:705
+#: src/mn-util.c:626
 msgid "_Do not show this message again"
 msgstr "_Nie pokazuj tej wiadomości ponownie"
 
-#: src/mn-util.c:789
+#: src/mn-util.c:710
 msgid "A fatal error has occurred in Mail Notification"
 msgstr "Fatalny błąd zdarzył się w Zawiadomieniu Pocztowym"
 
-#: src/mn-util.c:804
+#: src/mn-util.c:725
 #, c-format
 msgid "unable to get current time: %s"
 msgstr "niezdolny otrzymać aktualny czas: %s"
 
-#: src/mn-util.c:906
+#: src/mn-util.c:787
 #, c-format
 msgid "invalid signal specification \"%s\""
 msgstr "nieważna specyfikacja sygnału  \"%s\""
 
-#: src/mn-util.c:945
+#: src/mn-util.c:826
 msgid "A command error has occurred in Mail Notification"
 msgstr "Błąd rozkazowy występił w Zawiadomieniu Pocztowym"
 
-#: src/mn-util.c:946
+#: src/mn-util.c:827
 #, c-format
 msgid "Unable to execute \"%s\": %s."
 msgstr "Niezdolny do wykonania \"%s\": %s"
 
 #: ui/authentication.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ui/authentication.glade.h:2
 msgid "_Authenticate"
 msgstr "_Potwierdź tożsamości"
 
+#: ui/edit-toolbars.glade.h:1
+msgid "Edit Toolbars"
+msgstr ""
+
+#: ui/edit-toolbars.glade.h:2
+msgid "_Add a New Toolbar"
+msgstr ""
+
+#: ui/edit-toolbars.glade.h:3
+msgid "_Use Default"
+msgstr ""
+
 #: ui/mailbox-properties.glade.h:1
 msgid "_Mailbox type:"
-msgstr "_Rodzaję skrzynek pocztowych:"
+msgstr "_Typ połączenia:"
 
 #: ui/properties.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: ui/properties.glade.h:2
 msgid "<span weight=\"bold\">Commands</span>"
-msgstr "<span weight=\"bold\">Rozkazy</span>"
+msgstr "<span weight=\"bold\">Polecenia</span>"
 
-#: ui/properties.glade.h:3
+#: ui/properties.glade.h:2
 msgid "<span weight=\"bold\">Double-click Action</span>"
-msgstr "<span weight=\"bold\">Akcję podwójnego klikowania</span>"
+msgstr "<span weight=\"bold\">Podwójne kliknięcie</span>"
 
-#: ui/properties.glade.h:4
+#: ui/properties.glade.h:3
 msgid "<span weight=\"bold\">Fonts</span>"
 msgstr "<span weight=\"bold\">Czcionki</span>"
 
-#: ui/properties.glade.h:5
+#: ui/properties.glade.h:4
 msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">Ogólnę</span>"
+msgstr "<span weight=\"bold\">Ogólne</span>"
 
-#: ui/properties.glade.h:6
+#: ui/properties.glade.h:5
 msgid "<span weight=\"bold\">Mailbox List</span>"
-msgstr "<span weight=\"bold\">Lista Skrzynek Pocztowych</span>"
+msgstr "<span weight=\"bold\">Skrzynki pocztowe</span>"
 
-#: ui/properties.glade.h:7
+#: ui/properties.glade.h:6
 msgid "<span weight=\"bold\">Position</span>"
 msgstr "<span weight=\"bold\">Pozycja</span>"
 
+#: ui/properties.glade.h:7
+#, fuzzy
+msgid "Co_ntents:"
+msgstr "_Wybór czcionki treści:"
+
 #: ui/properties.glade.h:8
 msgid "Dis_play mail summary in tooltip"
-msgstr "Wyświetlaj streszczenia poczty w etykietce narzędzi"
+msgstr "_Wyświetlanie streszczenia poczty na obszarze powiadamiania"
 
 #: ui/properties.glade.h:9
 msgid "General"
-msgstr "Ogólnę"
+msgstr "Ogólne"
 
 #: ui/properties.glade.h:10
 msgid "Hori_zontal offset:"
-msgstr "Poziomę przesunięcie:"
+msgstr "Poziome przesunięcie:"
 
 #: ui/properties.glade.h:11
 msgid "Mail Notification Properties"
@@ -1547,7 +1815,7 @@ msgstr "Właściwości Zawiadomienia Pocztowego"
 
 #: ui/properties.glade.h:12
 msgid "Mail Summary Popup"
-msgstr "Wyskakujące okienko streszczenia poczty"
+msgstr "Streszczenie poczty"
 
 #: ui/properties.glade.h:13
 msgid "Mailboxes"
@@ -1555,7 +1823,7 @@ msgstr "Skrzynki pocztowe"
 
 #: ui/properties.glade.h:14
 msgid "Only display _recent mail"
-msgstr "Tylko wyświetlaj niedawną pocztę"
+msgstr "Wyświetlanie tylko nieprzeczytanych listów"
 
 #: ui/properties.glade.h:15
 msgid "P_osition:"
@@ -1581,7 +1849,7 @@ msgstr "Rozkaz do wykonania po przeczytaniu całej poczty"
 
 #: ui/properties.glade.h:20
 msgid "The command to run when new mail arrives"
-msgstr "Rozkaz do wykonania po przyjściu nowej poczty"
+msgstr "Rozkaz do wykonania po nadejściu nowej poczty"
 
 #: ui/properties.glade.h:21
 msgid ""
@@ -1600,110 +1868,101 @@ msgstr ""
 "wyskakującym okienkiem streszczenia poczty."
 
 #: ui/properties.glade.h:23
-msgid "When _all mail is read:"
-msgstr "Po przeczytaniu całej poczty:"
+msgid "Use these _fonts:"
+msgstr ""
 
 #: ui/properties.glade.h:24
-msgid "When _new mail arrives:"
-msgstr "Po przyjściu nowej poczty:"
+msgid "When _all mail is read:"
+msgstr "Po przeczytaniu całej poczty:"
 
 #: ui/properties.glade.h:25
-msgid "Whether the status icon should blink on errors or not"
-msgstr "Czy ikon stanu ma migać na błędach czy nie"
+msgid "When _new mail arrives:"
+msgstr "Po nadejściu nowej poczty:"
 
 #: ui/properties.glade.h:26
-msgid "Whether to automatically close the mail summary popup or not"
-msgstr ""
-"Czy automatycznie zamknąć wyskakujące okienko streszczenia poczty czy nie."
+msgid "Whether the status icon should blink on errors or not"
+msgstr "Migaj przy wystąpieniu błędów"
 
 #: ui/properties.glade.h:27
-msgid "Whether to display the mail summary in the status icon tooltip or not"
-msgstr ""
-"Czy wyświetlać streszczenie poczty w ikonie stanu etykiety narzędzi czy nie"
+msgid "Whether to automatically close the mail summary popup or not"
+msgstr "Zamknij automatycznie streszczenie poczty po upływie zadanego czasu"
 
 #: ui/properties.glade.h:28
-msgid "Whether to display the mail summary popup when new mail arrives or not"
-msgstr ""
-"Czy wyświetlać wyskakujące okienko streszczenia poczty po przyjściu nowej "
-"poczty czy nie"
+msgid "Whether to display the mail summary in the status icon tooltip or not"
+msgstr "Wyświetl streszczenie poczty w obszarze powiadamiania"
 
 #: ui/properties.glade.h:29
-msgid "Whether to hide previously displayed mail or not"
-msgstr "Czy schować poprzednio wyświetlaną pocztę czy nie"
+msgid "Whether to display the mail summary popup when new mail arrives or not"
+msgstr "Wyświetl streszczenie poczty po nadejściu nowych wiadomości"
 
 #: ui/properties.glade.h:30
-msgid "Whether to run a command when all mail is read or not"
-msgstr "Czy wykonywać rozkaz kiedy cała poczta jest przeczytana czy nie"
+msgid "Whether to hide previously displayed mail or not"
+msgstr "Ukrywaj przeczytane listy"
 
 #: ui/properties.glade.h:31
-msgid "Whether to run a command when new mail arrives or not"
-msgstr "Czy wydać rozkaz kiedy przyjdzie nowa poczta czy nie"
+msgid "Whether to run a command when all mail is read or not"
+msgstr "Uruchom polecenie, gdy cała poczta zostanie przeczytana"
 
 #: ui/properties.glade.h:32
-msgid "Whether to set a mail reader or not"
-msgstr "Czy ustawić czytnika poczty czy nie"
+msgid "Whether to run a command when new mail arrives or not"
+msgstr "Uruchom polecenie, gdy nadejdzie nowa poczta"
 
 #: ui/properties.glade.h:33
-msgid ""
-"Whether to start Mail Notification when you log into your GNOME session or "
-"not"
-msgstr ""
-"Czy załadować Zawiadomienie Pocztowe po wlogowaniu się w sesję GNOME czy nie"
+msgid "Whether to set a mail reader or not"
+msgstr "Ustaw czytnik poczty"
 
 #: ui/properties.glade.h:34
 msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
+"Whether to start Mail Notification when you log into your GNOME session or "
 "not"
-msgstr ""
-"Czy użyć niestandardową czcionkę do zawartości wyskakującego okienka "
-"streszczenia poczty czy nie"
+msgstr "Uruchom zawiadomienie pocztowe w trakcie startu środowiska graficznego"
 
 #: ui/properties.glade.h:35
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not"
-msgstr ""
-"Czy użyć niestandardową czcionkę do tytułu wyskakującego okienka "
-"streszczenia poczty czy nie"
+msgid "_Automatically close after:"
+msgstr "_Automatyczne zamknięcie okienka po:"
 
 #: ui/properties.glade.h:36
-msgid "_Automatically close after:"
-msgstr "_Automatycznie zamknij po:"
+msgid "_Blink on errors"
+msgstr "_Miganie przy błędach"
 
 #: ui/properties.glade.h:37
-msgid "_Blink on errors"
-msgstr "_Migaj na błędach"
+msgid "_Delay between mail checks:"
+msgstr "_Sprawdzanie poczty co:"
 
 #: ui/properties.glade.h:38
-msgid "_Contents font:"
-msgstr "_Czcionka zawartości:"
+#, fuzzy
+msgid "_Display the main window"
+msgstr "_Wyświetl streszczenie poczty"
 
 #: ui/properties.glade.h:39
-msgid "_Delay between mail checks:"
-msgstr "_Opuźnienie pomiędzy sprawdzaniem poczty:"
+msgid "_Enable mail summary popup"
+msgstr "_Streszczenie poczty"
 
 #: ui/properties.glade.h:40
-msgid "_Display the mail summary dialog"
-msgstr "_Wyświetlaj dialog streszczenia poczty"
+msgid "_Launch the mail reader"
+msgstr "U_ruchom czytnik poczty"
 
 #: ui/properties.glade.h:41
-msgid "_Enable mail summary popup"
-msgstr "_Umożliwij wyskakujące okienko streszczenia poczty"
+msgid "_Mail reader:"
+msgstr "C_zytnik poczty:"
 
 #: ui/properties.glade.h:42
-msgid "_Launch the mail reader"
-msgstr "U_ruchom czytnika poczty"
+msgid "_Start Mail Notification on GNOME login"
+msgstr "_Uruchomienie zawiadomienia pocztowego podczas logowania"
 
 #: ui/properties.glade.h:43
-msgid "_Mail reader:"
-msgstr "C_zytnik poczty:"
+#, fuzzy
+msgid "_Title:"
+msgstr "_Wybór czcionki tytułu:"
 
 #: ui/properties.glade.h:44
-msgid "_Start Mail Notification on GNOME login"
-msgstr "_Uruchom Zawiadomienie Pocztowe po wlogowaniu w GNOME"
+#, fuzzy
+msgid "_Update the mail status"
+msgstr "Odśwież stan poczty"
 
 #: ui/properties.glade.h:45
-msgid "_Title font:"
-msgstr "_Czcionka tytułu:"
+msgid "_Use fonts from theme"
+msgstr ""
 
 #: ui/properties.glade.h:46
 msgid "_Vertical offset:"
@@ -1711,7 +1970,7 @@ msgstr "_Pionowę przesunięcie"
 
 #: ui/properties.glade.h:47
 msgid "minutes"
-msgstr "minuty"
+msgstr "minut"
 
 #: ui/properties.glade.h:48
 msgid "pixels"
@@ -1719,19 +1978,20 @@ msgstr "piksele"
 
 #: ui/properties.glade.h:49
 msgid "seconds"
-msgstr "sekundy"
+msgstr "sekund"
 
 #: ui/summary-popup.glade.h:1
 msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">Zawiadomienie Pocztowe</span>"
+msgstr "<span size=\"larger\" weight=\"bold\">Zawiadomienie pocztowe</span>"
 
 #: ui/welcome.glade.h:1
+#, fuzzy
 msgid ""
 "<span weight=\"bold\" size=\"larger\">First startup</span>\n"
 "\n"
 "Mail Notification has been loaded successfully.\n"
 "\n"
-"Since this is the first time you run Mail Notification, you might want to "
+"Since this is the first time you run Mail Notification, you need to "
 "configure it.\n"
 "\n"
 "Note: this message will not be shown anymore. To configure Mail Notification "
@@ -1742,23 +2002,86 @@ msgid ""
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Premier démarrage</span>\n"
 "\n"
-"Zawiadomienie Pocztowe było pomyślnię załadowane.\n"
+"Zawiadomienie pocztowe było pomyślnie załadowane.\n"
 "\n"
 "Ponieważ uruchamiasz Zawiadomienia Pocztowego poraz pierwszy raz, może byś "
 "chciał je skonfigurować.\n"
 "\n"
 "Uwaga: ta wiadomość nie będzie więcej pokazywana. Jeśli byś ponownie chciał "
-"skonfigurować Zawiadomienie Pocztowe, wybież <span weight=\"bold"
+"skonfigurować Zawiadomienie pocztowe, wybierz <span weight=\"bold"
 "\">Aplikacje</span> → <span weight=\"bold\">Preferencje Desktopowe</span> → "
-"<span weight=\"bold\">Zawiadomienie Pocztowe</span> (lub na pewnych "
+"<span weight=\"bold\">Zawiadomienie pocztowe</span> (lub na pewnych "
 "systemach <span weight=\"bold\">Aplikacje</span> → <span weight=\"bold"
 "\">Preferencje</span> → <span weight=\"bold\">Więcej Preferencji</span> → "
-"<span weight=\"bold\">Zawiadomienie Pocztowe</span>)."
+"<span weight=\"bold\">Zawiadomienie pocztowe</span>)."
 
 #: ui/welcome.glade.h:8
 msgid "_Configure Mail Notification"
-msgstr "_Konfiguracja Zawiadomienia Pocztowego"
+msgstr "_Konfiguracja Zawiadomienia pocztowego"
 
 #: ui/welcome.glade.h:9
 msgid "_Skip configuration"
-msgstr "_Omiń konfigurację"
+msgstr "_Pomiń konfigurację"
+
+#~ msgid "Use a custom font for the contents of the mail summary popup"
+#~ msgstr ""
+#~ "Użyj niestandardową czcionkę dla zawartości wyskakującego okienka "
+#~ "streszczenia poczty"
+
+#~ msgid "Use a custom font for the title of the mail summary popup"
+#~ msgstr ""
+#~ "Użyj niestandardową czcionkę dla tytułu wyskakującego okienka "
+#~ "streszczenia poczty"
+
+#~ msgid ""
+#~ "Whether to use a custom font for the contents of the mail summary popup "
+#~ "or not."
+#~ msgstr ""
+#~ "Czy użyć niestandardową czcionkę dla zawartości wyskakującego okienka "
+#~ "streszczenia poczty czy nie."
+
+#~ msgid ""
+#~ "Whether to use a custom font for the title of the mail summary popup or "
+#~ "not."
+#~ msgstr ""
+#~ "Czy użyć niestandardową czcionkę dla tytułu wyskakującego okienka "
+#~ "streszczenia poczty czy nie."
+
+#~ msgid "server did not send status"
+#~ msgstr "serwer nie wysłał stanu"
+
+#~ msgid "_Launch Mail Reader"
+#~ msgstr "_Uruchom czytnik poczty"
+
+#~ msgid "Whether the mailbox has new mail or not"
+#~ msgstr "Czy skrzynka pocztowa ma nową pocztę czy nie"
+
+#~ msgid "%s has no new mail"
+#~ msgstr "%s nie ma nowej poczty"
+
+#~ msgid "Display the mail summary dialog"
+#~ msgstr "Wyświetlij dialog streszczenia poczty"
+
+#~ msgid "error while reading mailbox: %s"
+#~ msgstr "błąd podczas odczytywania skrzynki pocztowej: %s"
+
+#~ msgid "_Mail Summary"
+#~ msgstr "_Streszczenie poczty"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid ""
+#~ "Whether to use a custom font for the contents of the mail summary popup "
+#~ "or not"
+#~ msgstr "Ustaw czcionkę dla tytułu streszczenia poczty"
+
+#~ msgid ""
+#~ "Whether to use a custom font for the title of the mail summary popup or "
+#~ "not"
+#~ msgstr ""
+#~ "Czy użyć niestandardową czcionkę do tytułu wyskakującego okienka "
+#~ "streszczenia poczty czy nie"
diff --git a/po/pt.gmo b/po/pt.gmo
Binary files differ.
diff --git a/po/pt.po b/po/pt.po
@@ -1,17 +1,17 @@
 # Portuguese translations for mail-notification.
-# Copyright (c) 2003, 2004 Jean-Yves Lefort.
+# Copyright (C) 2003-2005 Jean-Yves Lefort.
 #
 # This file is distributed under the same license as the
 # mail-notification package.
 #
-# Duarte Henriques <duarte_henriques@myrealbox.com>, 2004.
+# Duarte Henriques <duarte_henriques@myrealbox.com>, 2004-2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mail-notification 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-25 01:43+0100\n"
-"PO-Revision-Date: 2004-11-23 14:28+0100\n"
+"POT-Creation-Date: 2005-03-02 02:32+0100\n"
+"PO-Revision-Date: 2005-03-01 02:19+0100\n"
 "Last-Translator: Duarte Henriques <duarte_henriques@myrealbox.com>\n"
 "Language-Team: Duarte Henriques <duarte_henriques@myrealbox.com>\n"
 "MIME-Version: 1.0\n"
@@ -27,14 +27,14 @@ msgstr "Automação da Notificação de Correio"
 msgid "Mail Notification automation factory"
 msgstr "Fábrica de automação de Notificação de Correio"
 
-#: data/mail-notification-properties.desktop.in.h:1
+#: data/mail-notification-properties.desktop.in.h:1 src/mn-main-window.c:145
 msgid "Configure Mail Notification"
 msgstr "Configurar Notificação de Correio"
 
 #: data/mail-notification-properties.desktop.in.h:2
 #: data/mail-notification.desktop.in.h:2
-#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:40
-#: src/mn-mail-icon.gob:194 src/mn-main.c:281
+#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:39
+#: src/mn-mail-icon.gob:224 src/mn-main.c:292 ui/main.glade.h:1
 msgid "Mail Notification"
 msgstr "Notificação de Correio"
 
@@ -83,90 +83,98 @@ msgid "Has already been run"
 msgstr "Já foi executado"
 
 #: data/mail-notification.schemas.in.h:11
-msgid "Height of mail summary dialog"
-msgstr "Altura do diálogo de resumo de correio"
+msgid "Height of edit toolbars dialog"
+msgstr "Altura do diálogo de edição de barras"
 
 #: data/mail-notification.schemas.in.h:12
+msgid "Height of main window"
+msgstr "Altura da janela principal"
+
+#: data/mail-notification.schemas.in.h:13
 msgid "Height of properties dialog"
 msgstr "Altura do diálogo de propriedades"
 
-#: data/mail-notification.schemas.in.h:13
+#: data/mail-notification.schemas.in.h:14
 msgid "Mail read command"
 msgstr "Comando de leitura de correio"
 
-#: data/mail-notification.schemas.in.h:14
+#: data/mail-notification.schemas.in.h:15
 msgid "Mail reader command"
 msgstr "Comando de leitor de correio"
 
-#: data/mail-notification.schemas.in.h:15
+#: data/mail-notification.schemas.in.h:16
 msgid "Mail summary popup contents font"
 msgstr "Fonte do conteúdo do popup de resumo de correio"
 
-#: data/mail-notification.schemas.in.h:16
+#: data/mail-notification.schemas.in.h:17
+msgid "Mail summary popup fonts aspect source"
+msgstr "Fonte do aspecto dasd fontes do popup de resumo de correio"
+
+#: data/mail-notification.schemas.in.h:18
 msgid "Mail summary popup horizontal offset"
 msgstr "Intervalo horizontal do popup de resumo de correio"
 
-#: data/mail-notification.schemas.in.h:17
+#: data/mail-notification.schemas.in.h:19
 msgid "Mail summary popup position"
 msgstr "Posição do popup de resumo de correio"
 
-#: data/mail-notification.schemas.in.h:18
+#: data/mail-notification.schemas.in.h:20
 msgid "Mail summary popup title font"
 msgstr "Fonte do título do popup de resumo de correio"
 
-#: data/mail-notification.schemas.in.h:19
+#: data/mail-notification.schemas.in.h:21
 msgid "Mail summary popup vertical offset"
 msgstr "Intervalo vertical do popup de resumo de correio"
 
-#: data/mail-notification.schemas.in.h:20
+#: data/mail-notification.schemas.in.h:22
 msgid "Mailbox list"
 msgstr "Lista de Caixas de Correio"
 
-#: data/mail-notification.schemas.in.h:21
+#: data/mail-notification.schemas.in.h:23
 msgid "Minutes between mail checks"
 msgstr "Minutos entre verificações de correio"
 
-#: data/mail-notification.schemas.in.h:22
+#: data/mail-notification.schemas.in.h:24
 msgid "Minutes to wait before closing the mail summary popup"
 msgstr "Minutos a esperar antes de fechar o popup de resumo de correio"
 
-#: data/mail-notification.schemas.in.h:23
+#: data/mail-notification.schemas.in.h:25
 msgid "New mail command"
 msgstr "Novo comando de correio"
 
-#: data/mail-notification.schemas.in.h:24
+#: data/mail-notification.schemas.in.h:26
 msgid "Only display recent mail in mail summary popup"
 msgstr "Mostrar apenas o correio recente no popup de resumo de correio"
 
-#: data/mail-notification.schemas.in.h:25
+#: data/mail-notification.schemas.in.h:27
 msgid "Run a command when all mail is read"
 msgstr "Executar um comando quando todo o correio está lido"
 
-#: data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:28
 msgid "Run a command when new mail arrives"
 msgstr "Executar um comando quando chega novo correio"
 
-#: data/mail-notification.schemas.in.h:27
+#: data/mail-notification.schemas.in.h:29
 msgid "Seconds between mail checks"
 msgstr "Segundos entre verificações de correio"
 
-#: data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:30
 msgid "Seconds to wait before closing the mail summary popup"
 msgstr "Segundos a esperar antes de fechar o popup de resumo de correio"
 
-#: data/mail-notification.schemas.in.h:29
+#: data/mail-notification.schemas.in.h:31
 msgid "Set a mail reader"
 msgstr "Definir um leitor de correio"
 
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:32
 msgid ""
 "The action to perform when the icon is double-clicked. Must be \"display-"
-"mail-summary\" or \"launch-mail-reader\"."
+"main-window\", \"launch-mail-reader\" or \"update-mail-status\"."
 msgstr ""
-"A acção a efectuar quando o se faz duplo-clique no ícone. Tem de ser "
-"\"display-mail-summary\" ou \"launch-mail-reader\"."
+"A acção a efectuar quando se faz duplo-clique no ícone. Tem de ser \"display-"
+"main-window\", \"launch-mail-reader\" ou \"update-mail-status\"."
 
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:33
 msgid ""
 "The amount of time to wait before closing the mail summary popup (minutes "
 "part)."
@@ -174,7 +182,7 @@ msgstr ""
 "A quantidade de tempo a esperar antes de fechar o popup de resumo de correio "
 "(parte dos minutos)."
 
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:34
 msgid ""
 "The amount of time to wait before closing the mail summary popup (seconds "
 "part)."
@@ -182,39 +190,51 @@ msgstr ""
 "A quantidade de tempo a esperar antes de fechar o popup de resumo de correio "
 "(parte dos segundos)."
 
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:35
+msgid ""
+"The aspect source of the mail summary popup fonts. Must be \"theme\" or "
+"\"custom\"."
+msgstr ""
+"A fonte de aspecto das fontes do popup de resumo de correio. Tem de ser "
+"\"theme\" ou \"custom\"."
+
+#: data/mail-notification.schemas.in.h:36
 msgid "The command to run to launch the mail reader."
 msgstr "O comando a executar para lançar o leitor de correio."
 
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:37
 msgid "The command to run when all mail is read."
 msgstr "O comando a executar quando todo o correio está lido."
 
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:38
 msgid "The command to run when new mail arrives."
 msgstr "O comando a executar quando chega novo correio."
 
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:39
 msgid "The custom font to use for the contents of the mail summary popup."
 msgstr "A fonte personalizada para o conteúdo do popup de resumo de correio."
 
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:40
 msgid "The custom font to use for the title of the mail summary popup."
 msgstr "A fonte personalizada para o título do popup de resumo de correio."
 
-#: data/mail-notification.schemas.in.h:38
-msgid "The height of the mail summary dialog in pixels."
-msgstr "A altura em pixeis do diálogo de resumo de correio."
+#: data/mail-notification.schemas.in.h:41
+msgid "The height of the edit toolbars dialog in pixels."
+msgstr "A altura em pixeis do diálogo de edição de barras."
 
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:42
+msgid "The height of the main window in pixels."
+msgstr "A altura em pixeis da janela principal."
+
+#: data/mail-notification.schemas.in.h:43
 msgid "The height of the properties dialog in pixels."
 msgstr "A altura em pixeis do diálogo de propriedades."
 
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:44
 msgid "The list of mailboxes to monitor."
 msgstr "A lista de caixas de correio a monitorizar."
 
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:45
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
@@ -222,14 +242,14 @@ msgstr ""
 "A lista de servidores SSL/TLS confiados (hostname:port) se faltar um "
 "certificado x509."
 
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:46
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
 msgstr ""
 "A lista de certificados x509 confiados, representados pela sua fingerprint "
 "MD5."
 
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:47
 msgid ""
 "The number of pixels to leave between the left or right side of the screen "
 "and the mail summary popup."
@@ -237,7 +257,7 @@ msgstr ""
 "O número de pixeis a deixar entre o extremo esquerdo ou direito do ecran e o "
 "popup de resumo de correio."
 
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:48
 msgid ""
 "The number of pixels to leave between the top or bottom side of the screen "
 "and the mail summary popup."
@@ -245,7 +265,7 @@ msgstr ""
 "O número de pixeis a deixar entre o topo ou fundo do ecran e o popup de "
 "resumo de correio."
 
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:49
 msgid ""
 "The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
 "\"bottom-left\" or \"bottom-right\"."
@@ -253,99 +273,110 @@ msgstr ""
 "A posição do popup de resumo de correio. Tem de ser \"top-left\", \"top-right"
 "\", \"bottom-left\" ou \"bottom-right\"."
 
-#: data/mail-notification.schemas.in.h:46
-msgid "The width of the mail summary dialog in pixels."
-msgstr "A largura em pixeis do diálogo de resumo de correio."
+#: data/mail-notification.schemas.in.h:50
+msgid ""
+"The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text\", "
+"\"both\" or \"both-horiz\"."
+msgstr ""
+"O estilo das barras de ferramentas. Tem de ser \"desktop-default\", \"icons"
+"\", \"text\", \"both\" ou \"both-horiz\"."
 
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:51
+msgid "The width of the edit toolbars dialog in pixels."
+msgstr "A largura em pixeis do diálogo de edição de barras."
+
+#: data/mail-notification.schemas.in.h:52
+msgid "The width of the main window in pixels."
+msgstr "A largura em pixeis da janela principal."
+
+#: data/mail-notification.schemas.in.h:53
 msgid "The width of the properties dialog in pixels."
 msgstr "A largura em pixeis do diálogo de propriedades."
 
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:54
+msgid "Toolbars style"
+msgstr "Estilo das barras de ferramentas"
+
+#: data/mail-notification.schemas.in.h:55
 msgid "Trusted servers list"
 msgstr "Lista de servidores confiados"
 
-#: data/mail-notification.schemas.in.h:49
-msgid "Use a custom font for the contents of the mail summary popup"
-msgstr ""
-"Usar uma fonte personalizada para o conteúdo do popup de resumo de correio"
+#: data/mail-notification.schemas.in.h:56
+msgid "View statusbar"
+msgstr "Ver barra de estado"
 
-#: data/mail-notification.schemas.in.h:50
-msgid "Use a custom font for the title of the mail summary popup"
-msgstr ""
-"Usar uma fonte personalizada para o título do popup de resumo de correio"
+#: data/mail-notification.schemas.in.h:57
+msgid "View toolbars"
+msgstr "Ver barras de ferramentas"
 
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:58
 msgid "Whether Mail Notification has already been run or not."
 msgstr "Se a Notificação de Correio já foi executada ou não."
 
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:59
 msgid "Whether the status icon should blink on errors or not."
 msgstr "Se o ícone de estado deve piscar em erros ou não."
 
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:60
+msgid "Whether the statusbar should be visible or not."
+msgstr "Se a barra de estado deve estar visível ou não."
+
+#: data/mail-notification.schemas.in.h:61
+msgid "Whether the toolbars should be visible or not."
+msgstr "Se as barras de ferramentas devem estar visíveis ou não."
+
+#: data/mail-notification.schemas.in.h:62
 msgid "Whether to automatically close the mail summary popup or not."
 msgstr ""
 "Se o popup de resumo de correio deve ser automaticamente fechado ou não."
 
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:63
 msgid "Whether to display the mail summary in the status icon tooltip or not."
 msgstr ""
 "Se o resumo de correio deve ser mostrado na dica do ícone de estado ou não."
 
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:64
 msgid "Whether to display the mail summary popup when new mail arrives or not."
 msgstr ""
 "Se o popup de resumo de correio deve ser mostrado quando chega correio ou "
 "não."
 
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:65
 msgid ""
 "Whether to hide previously displayed mail in the mail summary popup or not."
 msgstr ""
 "Se o correio previamente mostrado deve ser escondido no popup de resumo de "
 "correio ou não."
 
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:66
 msgid ""
 "Whether to prevent the immediate notification error dialog from being "
 "displayed or not."
 msgstr ""
 "Se se evita o diálogo de erro de notificação imediata de ser mostrado ou não."
 
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:67
 msgid "Whether to run a command when all mail is read or not."
 msgstr ""
 "Se um comando deverá ser executado quando todo o correio é lido ou não."
 
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:68
 msgid "Whether to run a command when new mail arrives or not."
 msgstr "Se um comando deverá ser executado quando chega novo correio."
 
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:69
 msgid "Whether to set a mail reader or not."
 msgstr "Se um leitor de correio deve ser definido ou não."
 
-#: data/mail-notification.schemas.in.h:61
-msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
-"not."
-msgstr ""
-"Se deve ser usada uma fonte personalizada para o conteúdo do popup de resumo "
-"de correio ou não."
-
-#: data/mail-notification.schemas.in.h:62
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not."
-msgstr ""
-"Se deve ser usada uma fonte personalizada para o título do popup de resumo "
-"de correio ou não."
+#: data/mail-notification.schemas.in.h:70
+msgid "Width of edit toolbars dialog"
+msgstr "Largura do diálogo de edição de barras"
 
-#: data/mail-notification.schemas.in.h:63
-msgid "Width of mail summary dialog"
-msgstr "Largura do diálogo de resumo de correio"
+#: data/mail-notification.schemas.in.h:71
+msgid "Width of main window"
+msgstr "Largura da janela principal"
 
-#: data/mail-notification.schemas.in.h:64
+#: data/mail-notification.schemas.in.h:72
 msgid "Width of properties dialog"
 msgstr "Largura do diálogo de propriedades"
 
@@ -353,6 +384,22 @@ msgstr "Largura do diálogo de propriedades"
 msgid "New Mail"
 msgstr "Novo Correio"
 
+#: src/egg-editable-toolbar.c:536
+msgid "_Remove Toolbar"
+msgstr "_Remover Barra de Ferramentas"
+
+#: src/egg-toolbar-editor.c:558
+msgid "Separator"
+msgstr "Separador"
+
+#: src/egg-toolbar-editor.c:588
+msgid ""
+"Drag an item onto the toolbars above to add it, from the toolbars in the "
+"items table to remove it."
+msgstr ""
+"Arraste um item para as barras para o adicionar, das barras para a tabela de "
+"items para o remover"
+
 #: src/eggtrayicon.c:109
 msgid "Orientation"
 msgstr "Orientação"
@@ -361,20 +408,20 @@ msgstr "Orientação"
 msgid "The orientation of the tray."
 msgstr "A orientação do tabuleiro."
 
-#: src/mn-about-dialog.gob:43
+#: src/mn-about-dialog.gob:42
 msgid "A Mail Notification Icon"
 msgstr "Um Ícone de Notificação de Correio"
 
 #. translator: replace with your name and email
-#: src/mn-about-dialog.gob:47
+#: src/mn-about-dialog.gob:46
 msgid "Jean-Yves Lefort <jylefort@brutele.be>"
 msgstr "Duarte Henriques <duarte_henriques@myrealbox.com>"
 
-#: src/mn-auth-combo-box.gob:101 src/mn-autodetect-mailbox-properties.gob:37
+#: src/mn-auth-combo-box.gob:102 src/mn-autodetect-mailbox-properties.gob:39
 msgid "<span style=\"italic\">autodetect</span>"
 msgstr "<span style=\"italic\">autodetectar</span>"
 
-#: src/mn-authenticated-mailbox.gob:80
+#: src/mn-authenticated-mailbox.gob:85
 #, c-format
 msgid ""
 "Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -387,12 +434,12 @@ msgstr ""
 "\n"
 "Por favor re-insira a senha."
 
-#: src/mn-authenticated-mailbox.gob:81
+#: src/mn-authenticated-mailbox.gob:86
 #, c-format
 msgid "Enter your password for %s mailbox %s."
 msgstr "Digite a senha para a caixa de correio %s, utilizador %s."
 
-#: src/mn-authenticated-mailbox.gob:132
+#: src/mn-authenticated-mailbox.gob:137
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Mail Notification requires a password</"
@@ -405,11 +452,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mn-autodetect-mailbox-properties.gob:68
+#: src/mn-autodetect-mailbox-properties.gob:70
 msgid "_Location:"
 msgstr "_Localização:"
 
-#: src/mn-autodetect-mailbox-properties.gob:74
+#: src/mn-autodetect-mailbox-properties.gob:76
 msgid "_Browse..."
 msgstr "_Procurar..."
 
@@ -417,7 +464,7 @@ msgstr "_Procurar..."
 msgid "The URI of the mailbox"
 msgstr "O URI da caixa de correio"
 
-#: src/mn-autodetect-mailbox-properties.gob:118
+#: src/mn-autodetect-mailbox-properties.gob:123
 msgid "Select a File or Folder"
 msgstr "Escolha um Ficheiro ou Pasta"
 
@@ -553,77 +600,77 @@ msgstr "incapaz de ler do servidor: EOF"
 msgid "unable to decode data using SASL: %s"
 msgstr "incapaz de descodificar dados usando SASL: %s"
 
-#: src/mn-client-session.c:746
+#: src/mn-client-session.c:743
 #, c-format
 msgid "unable to encode data using SASL: %s"
 msgstr "incapaz de encodificar dados usando SASL: %s"
 
-#: src/mn-client-session.c:777 src/mn-client-session.c:784
+#: src/mn-client-session.c:774 src/mn-client-session.c:781
 #, c-format
 msgid "unable to write to server: %s"
 msgstr "incapaz de escrever para o servidor: %s"
 
-#: src/mn-client-session.c:782
+#: src/mn-client-session.c:779
 msgid "unable to write to server: EOF"
 msgstr "incapaz de escrever para o servidor: EOF"
 
-#: src/mn-client-session.c:814
+#: src/mn-client-session.c:811
 #, c-format
 msgid "unable to encode Base64: %s"
 msgstr "incapaz de encodificar em Base64: %s"
 
-#: src/mn-client-session.c:925
+#: src/mn-client-session.c:922
 #, c-format
 msgid "unable to initialize the SASL library: %s"
 msgstr "incapaz de inicializar a biblioteca SASL: %s"
 
-#: src/mn-client-session.c:934
+#: src/mn-client-session.c:931
 #, c-format
 msgid "unable to retrieve local address of socket: %s"
 msgstr "incapaz de obter o endereço local do socket: %s"
 
-#: src/mn-client-session.c:940
+#: src/mn-client-session.c:937
 #, c-format
 msgid "unable to retrieve remote address of socket: %s"
 msgstr "incapaz de obter endereço remoto do socket: %s"
 
-#: src/mn-client-session.c:974
+#: src/mn-client-session.c:971
 #, c-format
-msgid "warning: unable to set SASL security properties: %s"
-msgstr "aviso: incapaz de definir as propriedades de segurança SASL: %s"
+msgid "unable to set SASL security properties: %s"
+msgstr "incapaz de definir as propriedades de segurança SASL: %s"
 
-#: src/mn-client-session.c:998
+#: src/mn-client-session.c:995
 msgid ""
 "unable to start SASL authentication: SASL asked for something we did not know"
 msgstr ""
 "incapaz de iniciar a autenticação SASL: SASL perguntou algo que não sabíamos"
 
-#: src/mn-client-session.c:1017
+#: src/mn-client-session.c:1014
 #, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr "incapaz de iniciar autenticação SASL: %s"
 
-#: src/mn-client-session.c:1021
+#: src/mn-client-session.c:1018
 #, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr "incapaz de criar uma ligação SASL: %s"
 
-#: src/mn-client-session.c:1058
+#: src/mn-client-session.c:1055
 msgid "SASL asked for something we did not know, aborting SASL authentication"
 msgstr "SASL perguntou algo que não sabíamos, abortando a autenticação SASL"
 
-#: src/mn-client-session.c:1075
+#: src/mn-client-session.c:1072
 #, c-format
 msgid "%s, aborting SASL authentication"
 msgstr "%s, abortando a autenticação SASL"
 
 #. compliance error
-#: src/mn-client-session.c:1080
+#: src/mn-client-session.c:1077
 #, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr "incapaz de descodificar o input em Base64 do servidor: %s"
 
-#: src/mn-client-session.c:1083
+#: src/mn-client-session.c:1080
 msgid ""
 "the server sent a SASL challenge, but there was a pending initial SASL "
 "client response"
@@ -631,7 +678,7 @@ msgstr ""
 "o servidor enviou um desafio SASL, mas havia uma resposta SASL inicial "
 "pendente do cliente"
 
-#: src/mn-client-session.c:1097
+#: src/mn-client-session.c:1094
 msgid ""
 "the server did not send a SASL challenge, but there was no pending initial "
 "SASL client response"
@@ -639,40 +686,49 @@ msgstr ""
 "o servidor não enviou um desafio SASL, mas não havia uma resposta SASL "
 "inicial pendente do cliente"
 
-#: src/mn-client-session.c:1122
+#: src/mn-client-session.c:1119
 #, c-format
 msgid "a SASL security layer of strength factor %i is now active"
 msgstr "está agora activa uma camada de segurança SASL com factor de força %i"
 
 #. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: src/mn-client-session.c:1127
+#: src/mn-client-session.c:1124
 #, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr "incapaz de obter a propriedade SASL_MAXOUTBUF: %s"
 
-#: src/mn-client-session.c:1133
+#: src/mn-client-session.c:1130
 #, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr "aviso: incapaz de obter a propriedade SASL_SSF: %s"
 
-#: src/mn-conf.c:145
+#: src/mn-conf.c:238
+msgid "A directory creation error has occurred"
+msgstr "Ocorreu um erro de criação de directoria"
+
+#: src/mn-conf.c:239
+#, c-format
+msgid "Unable to create directory \"%s\": %s."
+msgstr "Incapaz de criar directoria \"%s\": %s."
+
+#: src/mn-conf.c:313
 #, c-format
 msgid "recursively unsetting %s"
 msgstr "apagando recursivamente %s"
 
-#: src/mn-conf.c:149
+#: src/mn-conf.c:317
 msgid "syncing the GConf database"
 msgstr "sincronizando a base de dados GConf"
 
-#: src/mn-conf.c:152
+#: src/mn-conf.c:320
 msgid "completed"
 msgstr "completo"
 
-#: src/mn-gmail-mailbox-properties.gob:77
+#: src/mn-gmail-mailbox-properties.gob:76
 msgid "Your Gmail username"
 msgstr "O seu nome de utilizador Gmail"
 
-#: src/mn-gmail-mailbox-properties.gob:78
+#: src/mn-gmail-mailbox-properties.gob:77
 msgid ""
 "Your Gmail password (if left blank, you will be prompted for the password "
 "when needed)"
@@ -680,36 +736,59 @@ msgstr ""
 "A sua senha Gmail (se deixar em branco, a senha será pedida quando "
 "necessária)"
 
-#: src/mn-gmail-mailbox.gob:82
+#: src/mn-gmail-mailbox.gob:86
 msgid "libsoup has not been compiled with SSL/TLS support"
 msgstr "libsoup não foi compilada com suporte SSL/TLS"
 
-#: src/mn-gmail-mailbox.gob:160
+#: src/mn-gmail-mailbox.gob:164
 #, c-format
 msgid "unable to parse URI \"%s\""
 msgstr "incapaz de processar URI \"%s\""
 
-#: src/mn-gmail-mailbox.gob:214
+#: src/mn-gmail-mailbox.gob:217
+msgid "received non-UTF-8 data from server"
+msgstr "dados não-UTF-8 recebidos do servidor"
+
+#: src/mn-gmail-mailbox.gob:224
 #, c-format
 msgid "unable to transfer data: %s"
 msgstr "incapaz de transferir dados: %s"
 
-#: src/mn-gmail-mailbox.gob:335
+#: src/mn-gmail-mailbox.gob:345
 msgid "logging in"
 msgstr "ligando-se"
 
-#: src/mn-gmail-mailbox.gob:413
+#: src/mn-gmail-mailbox.gob:423
 msgid "login failed"
 msgstr "login falhou"
 
-#: src/mn-gmail-mailbox.gob:488
+#: src/mn-gmail-mailbox.gob:496
 msgid "searching for unread mail"
 msgstr "a procurar correio não lido"
 
 #: src/mn-gmail-mailbox.gob:527
+msgid "unable to initialize the ICU library"
+msgstr "incapaz de inicializar a biblioteca ICU"
+
+#: src/mn-gmail-mailbox.gob:554
 msgid "unable to parse Gmail data"
 msgstr "incapaz de processar dados Gmail"
 
+#: src/mn-gmail-mailbox.gob:891
+#, c-format
+msgid "unable to open calendar: %s"
+msgstr "incapaz de abrir calendário: %s"
+
+#: src/mn-gmail-mailbox.gob:899
+#, c-format
+msgid "unable to set calendar time: %s"
+msgstr "incapaz de definir tempo de calendário: %s"
+
+#: src/mn-gmail-mailbox.gob:968
+#, c-format
+msgid "unable to get calendar time: %s"
+msgstr "incapaz de obter tempo de calendário: %s"
+
 #: src/mn-gmime-stream-vfs.gob:49
 #, c-format
 msgid "unable to read %s: %s"
@@ -735,19 +814,19 @@ msgstr "incapaz de dizer a posição em %s: %s"
 msgid "unable to close %s: %s"
 msgstr "incapaz de fechar %s: %s"
 
-#: src/mn-imap-mailbox-properties.gob:94
+#: src/mn-imap-mailbox-properties.gob:95
 msgid "Mailbox:"
 msgstr "Caixa de Correio:"
 
-#: src/mn-imap-mailbox-properties.gob:98
+#: src/mn-imap-mailbox-properties.gob:99
 msgid "in_box"
 msgstr "caixa de _entrada"
 
-#: src/mn-imap-mailbox-properties.gob:109
+#: src/mn-imap-mailbox-properties.gob:110
 msgid "oth_er:"
 msgstr "_outros"
 
-#: src/mn-imap-mailbox-properties.gob:121
+#: src/mn-imap-mailbox-properties.gob:122
 msgid "U_se idle mode if possible"
 msgstr "U_sar modo inactivo se possível"
 
@@ -780,50 +859,45 @@ msgstr "O nome da caixa de correio"
 msgid "If possible, whether to use idle mode or not"
 msgstr "Se possível, usar modo inactivo ou não"
 
-#: src/mn-imap-mailbox.gob:166 src/mn-pop3-mailbox.gob:143
+#: src/mn-imap-mailbox.gob:156 src/mn-pop3-mailbox.gob:136
 msgid "SSL/TLS support has not been compiled in"
 msgstr "suporte SSL/TLS não foi compilado"
 
-#: src/mn-imap-mailbox.gob:246
+#: src/mn-imap-mailbox.gob:236
 msgid "server did not send capabilities"
 msgstr "servidor não enviou habilidades"
 
-#: src/mn-imap-mailbox.gob:418
+#: src/mn-imap-mailbox.gob:408
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
 msgstr "servidor anunciou LOGINDISABLED, não usando a autenticação LOGIN"
 
-#: src/mn-imap-mailbox.gob:419
+#: src/mn-imap-mailbox.gob:409
 msgid "unable to login"
 msgstr "incapaz de ligar"
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:571
+#: src/mn-imap-mailbox.gob:542
 msgid "server did not send search results"
 msgstr "servidor não enviou resultados da procura"
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:651
+#: src/mn-imap-mailbox.gob:617
 msgid "server did not send all the messages we requested"
 msgstr "servidor não enviou todas as mensagens pedidas"
 
-#: src/mn-imap-mailbox.gob:700
+#: src/mn-imap-mailbox.gob:671
 msgid "unable to fetch message"
 msgstr "incapaz de obter mensagem"
 
-#. compliance error
-#: src/mn-imap-mailbox.gob:818
-msgid "server did not send status"
-msgstr "servidor não enviou estado"
-
-#: src/mn-imap-mailbox.gob:1096 src/mn-pop3-mailbox.gob:972
+#: src/mn-imap-mailbox.gob:1006 src/mn-pop3-mailbox.gob:927
 msgid "unknown server error"
 msgstr "erro de servidor desconhecido"
 
-#: src/mn-imap-mailbox.gob:1198 src/mn-pop3-mailbox.gob:227
+#: src/mn-imap-mailbox.gob:1108 src/mn-pop3-mailbox.gob:220
 msgid "server does not support in-band SSL/TLS"
 msgstr "servidor não suporta SSL/TLS in-band"
 
-#: src/mn-imap-mailbox.gob:1217 src/mn-pop3-mailbox.gob:885
+#: src/mn-imap-mailbox.gob:1127 src/mn-pop3-mailbox.gob:837
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
@@ -831,24 +905,28 @@ msgstr ""
 "foi escolhido um mecanismo de autenticação SASL, mas o suporte SASL não foi "
 "compilado"
 
-#: src/mn-imap-mailbox.gob:1225 src/mn-pop3-mailbox.gob:897
+#: src/mn-imap-mailbox.gob:1137 src/mn-pop3-mailbox.gob:857
 #, c-format
 msgid "unknown authentication mechanism \"%s\""
 msgstr "mecanismo de autenticação desconhecido \"%s\""
 
-#: src/mn-imap-mailbox.gob:1246
+#: src/mn-imap-mailbox.gob:1160
 msgid "falling back to IMAP LOGIN authentication"
 msgstr "recorrendo à autenticação IMAP LOGIN"
 
-#: src/mn-imap-mailbox.gob:1257 src/mn-pop3-mailbox.gob:938
+#: src/mn-imap-mailbox.gob:1172 src/mn-pop3-mailbox.gob:901
 msgid "authentication failed"
 msgstr "autenticação falhou"
 
-#: src/mn-mail-icon.gob:92 ui/summary-dialog.glade.h:2
-msgid "_Launch Mail Reader"
-msgstr "_Lançar Leitor de Correio"
+#: src/mn-mail-icon.gob:91
+msgid "Main _Window"
+msgstr "_Janela Principal"
 
-#: src/mn-mail-icon.gob:93 ui/summary-dialog.glade.h:3
+#: src/mn-mail-icon.gob:92 src/mn-main-window.c:101
+msgid "_Mail Reader"
+msgstr "_Leitor de correio"
+
+#: src/mn-mail-icon.gob:93 src/mn-main-window.c:109
 msgid "_Update"
 msgstr "_Actualizar"
 
@@ -856,20 +934,20 @@ msgstr "_Actualizar"
 msgid "R_emove From Notification Area"
 msgstr "_Remover da área de notificação"
 
-#: src/mn-mailbox-properties-dialog.c:109
+#: src/mn-mailbox-properties-dialog.c:156
 msgid "Add a Mailbox"
 msgstr "Acrescentar uma Caixa de Correio"
 
-#: src/mn-mailbox-properties-dialog.c:328
+#: src/mn-mailbox-properties-dialog.c:325
 #, c-format
 msgid "%s Properties"
 msgstr "Propriedades de %s"
 
-#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:4
+#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:3
 msgid "_Username:"
 msgstr "Nome de _Utilizador:"
 
-#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:3
+#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:2
 msgid "_Password:"
 msgstr "_Senha:"
 
@@ -909,61 +987,57 @@ msgstr "Completo"
 msgid "Whether the properties are completely filled or not"
 msgstr "Se as propriedades estão completamente preenchidas"
 
-#: src/mn-mailbox-view.gob:263 src/mn-message-box.gob:61
+#: src/mn-mailbox-view.gob:271 src/mn-message-view.gob:312
 msgid "Mailbox"
 msgstr "Caixa de Correio"
 
 #. format column
-#: src/mn-mailbox-view.gob:279
+#: src/mn-mailbox-view.gob:287
 msgid "Format"
 msgstr "Formato"
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "Unable to add mailbox"
 msgstr "Incapaz de adicionar caixa de correio"
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "The mailbox is already in the list."
 msgstr "A caixa de correio já está na lista."
 
-#: src/mn-mailbox.gob:130
+#: src/mn-mailbox.gob:131
 msgid "The mailbox URI"
 msgstr "O URI da caixa de correio"
 
-#: src/mn-mailbox.gob:141
+#: src/mn-mailbox.gob:142
 msgid "The mailbox human-readable name"
 msgstr "O nome legível da caixa de correio"
 
-#: src/mn-mailbox.gob:145
+#: src/mn-mailbox.gob:146
 msgid "Whether the mailbox has to be polled or not"
 msgstr "Se a caixa de correio tem de ser constantemente verificada ou não"
 
-#: src/mn-mailbox.gob:151
-msgid "Whether the mailbox has new mail or not"
-msgstr "Se a caixa de correio tem novo correio"
-
-#: src/mn-mailbox.gob:156
+#: src/mn-mailbox.gob:152
 msgid "The list of new and unread MNMessage objects"
 msgstr "A lista de objectos MNMessage novos e não lidos"
 
-#: src/mn-mailbox.gob:210
+#: src/mn-mailbox.gob:206
 msgid "The mailbox error, if any"
 msgstr "O erro da caixa de correio, se houver"
 
-#: src/mn-mailbox.gob:309
+#: src/mn-mailbox.gob:305
 msgid "does not exist"
 msgstr "não existe"
 
-#: src/mn-mailbox.gob:341
+#: src/mn-mailbox.gob:337
 msgid "unknown format"
 msgstr "formato desconhecido"
 
-#: src/mn-mailbox.gob:407
+#: src/mn-mailbox.gob:403
 #, c-format
-msgid "unable to enable immediate notification for %s: %s"
-msgstr "incapaz de activar notificação imediata para %s: %s"
+msgid "unable to enable immediate notification: %s"
+msgstr "incapaz de activar notificação imediata: %s"
 
-#: src/mn-mailbox.gob:425
+#: src/mn-mailbox.gob:421
 #, c-format
 msgid ""
 "As a fallback, they will be checked every %i second (this delay is "
@@ -978,7 +1052,7 @@ msgstr[1] ""
 "Como medida de recurso, serão verificadas a cada %i segundos (este atraso é "
 "configurável no Diálogo de Propriedades)."
 
-#: src/mn-mailbox.gob:436
+#: src/mn-mailbox.gob:432
 #, c-format
 msgid ""
 "As a fallback, they will be checked every %i minute (this delay is "
@@ -993,7 +1067,7 @@ msgstr[1] ""
 "Como medida de recurso, serão verificadas a cada %i minutos (este atraso é "
 "configurável no Diálogo de Propriedades)."
 
-#: src/mn-mailbox.gob:447
+#: src/mn-mailbox.gob:443
 #, c-format
 msgid ""
 "As a fallback, they will be checked approximately every %i minute (this "
@@ -1008,11 +1082,11 @@ msgstr[1] ""
 "Como medida de recurso, serão verificadas aproximadamente cada %i minutos "
 "(este atraso é configurável no Diálogo de Propriedades)."
 
-#: src/mn-mailbox.gob:463
+#: src/mn-mailbox.gob:459
 msgid "A monitoring error has occurred"
 msgstr "Ocorreu um erro de monitorização"
 
-#: src/mn-mailbox.gob:464
+#: src/mn-mailbox.gob:460
 #, c-format
 msgid ""
 "Mail Notification was unable to enable immediate notification for one or "
@@ -1021,100 +1095,253 @@ msgstr ""
 "A Notificação de Correio foi incapaz de activar notificação imediata para "
 "uma ou mais caixas de correio. %s"
 
-#: src/mn-mailboxes.gob:142
+#: src/mn-mailboxes.gob:130
 msgid "Whether one or more of the mailboxes has to be polled"
 msgstr "Se uma ou mais caixas de correio têm de ser manualmente verificadas"
 
-#: src/mn-mailboxes.gob:272
+#: src/mn-mailboxes.gob:260
 #, c-format
 msgid "%s is unsupported: %s"
 msgstr "%s não é suportado: %s"
 
-#: src/mn-mailboxes.gob:304
+#: src/mn-mailboxes.gob:290
 #, c-format
-msgid "%s has new mail"
-msgstr "%s tem correio novo"
+msgid "%s has %i new message"
+msgid_plural "%s has %i new messages"
+msgstr[0] "%s tem %i mensagem nova"
+msgstr[1] "%s tem %i mensagens novas"
 
-#: src/mn-mailboxes.gob:304
-#, c-format
-msgid "%s has no new mail"
-msgstr "%s não tem correio novo"
-
-#: src/mn-mailboxes.gob:330
+#: src/mn-mailboxes.gob:307
 #, c-format
 msgid "%s reported an error: %s"
 msgstr "%s relatou um erro: %s"
 
-#: src/mn-maildir-mailbox.gob:119
+#: src/mn-maildir-mailbox.gob:112
 #, c-format
 msgid "unable to open folder \"new\": %s"
 msgstr "incapaz de abrir pasta \"new\": %s"
 
-#: src/mn-maildir-mailbox.gob:161
+#: src/mn-maildir-mailbox.gob:141
 #, c-format
 msgid "unable to close folder \"new\": %s"
 msgstr "incapaz de fechar pasta \"new\": %s"
 
-#: src/mn-maildir-mailbox.gob:164
+#: src/mn-maildir-mailbox.gob:144
 #, c-format
 msgid "error while reading folder \"new\": %s"
 msgstr "erro ao ler pasta \"new\": %s"
 
+#. Toplevel
+#: src/mn-main-window.c:92
+msgid "_Mail"
+msgstr "_Correio"
+
+#: src/mn-main-window.c:93
+msgid "_Edit"
+msgstr "_Editar"
+
+#: src/mn-main-window.c:94
+msgid "_View"
+msgstr "_Ver"
+
+#: src/mn-main-window.c:95
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: src/mn-main-window.c:103
+msgid "Launch the mail reader"
+msgstr "Lançar o leitor de correio"
+
+#. Reload
+#: src/mn-main-window.c:111 src/mn-main.c:230
+msgid "Update the mail status"
+msgstr "Actualizar o estado do correio"
+
+#: src/mn-main-window.c:117
+msgid "_Close"
+msgstr "_Fechar"
+
+#: src/mn-main-window.c:119
+msgid "Close this window"
+msgstr "Fechar esta janela"
+
+#: src/mn-main-window.c:125
+msgid "_Quit"
+msgstr "_Sair"
+
+#: src/mn-main-window.c:127 src/mn-main.c:257
+msgid "Quit Mail Notification"
+msgstr "Sair da Notificação de Correio"
+
+#: src/mn-main-window.c:135 src/mn-main-window.c:183
+msgid "_Toolbars"
+msgstr "_Barras de Ferramentas"
+
+#: src/mn-main-window.c:137
+msgid "Customize the toolbars"
+msgstr "Personalizar as barras"
+
+#: src/mn-main-window.c:143
+msgid "_Preferences"
+msgstr "_Preferências"
+
+#: src/mn-main-window.c:153
+msgid "Toolbars Styl_e"
+msgstr "_Estilo das Barras"
+
+#: src/mn-main-window.c:155
+msgid "Customize the toolbars style"
+msgstr "Personalizar o estilo das barras"
+
+#: src/mn-main-window.c:163
+msgid "_Contents"
+msgstr "_Conteúdo"
+
+#: src/mn-main-window.c:165
+msgid "Display help"
+msgstr "Mostrar Ajuda"
+
+#: src/mn-main-window.c:171
+msgid "_About"
+msgstr "_Sobre"
+
+#: src/mn-main-window.c:173
+msgid "Display credits"
+msgstr "Mostrar créditos"
+
+#: src/mn-main-window.c:185
+msgid "Show or hide the toolbars"
+msgstr "mostrar ou esconder as barras de ferramentas"
+
+#: src/mn-main-window.c:192
+msgid "_Statusbar"
+msgstr "_Barra de estado"
+
+#: src/mn-main-window.c:194
+msgid "Show or hide the statusbar"
+msgstr "Mostrar ou esconder a barra de estado"
+
+#: src/mn-main-window.c:205
+msgid "_Desktop Default"
+msgstr "_Omissão do Ambiente"
+
+#: src/mn-main-window.c:207
+msgid "Set the toolbars style to the desktop default setting"
+msgstr ""
+"Definir o estilo de barras de ferramentas para a definição por omissão do "
+"ambiente de trabalho"
+
+#: src/mn-main-window.c:213
+msgid "I_cons Only"
+msgstr "Apenas Ì_cones"
+
+#: src/mn-main-window.c:215
+msgid "Only display the toolbars icons"
+msgstr "Mostrar apenas ícones da barra de ferramentas"
+
+#: src/mn-main-window.c:221
+msgid "_Text Only"
+msgstr "apenas _Texto"
+
+#: src/mn-main-window.c:223
+msgid "Only display the toolbars text"
+msgstr "Mostrar apenas o testo da barra de ferramentas"
+
+#: src/mn-main-window.c:229
+msgid "Text Belo_w Icons"
+msgstr "Texto _sob Icones"
+
+#: src/mn-main-window.c:231
+msgid "Display the toolbars text below the icons"
+msgstr "Mostrar o texto das barras sob os ícones"
+
+#: src/mn-main-window.c:237
+msgid "Text Be_side Icons"
+msgstr "Texto ao lado dos Icones"
+
+#: src/mn-main-window.c:239
+msgid "Display the toolbars text beside the icons"
+msgstr "Mostrar o texto das barras de ferramentas ao lado dos ícones"
+
+#: src/mn-main-window.c:363
+#, c-format
+msgid "unable to load menus.xml: %s"
+msgstr "incapaz de varregar menus.xml: %s"
+
+#: src/mn-main-window.c:398
+msgid "Help messages"
+msgstr "Mensagens de Ajuda"
+
+#: src/mn-main-window.c:399
+msgid "Count messages"
+msgstr "Mensagens de contagem"
+
+#: src/mn-main-window.c:503
+#, c-format
+msgid "%i new message"
+msgid_plural "%i new messages"
+msgstr[0] "%i mensagem nova"
+msgstr[1] "%i mensagens novas"
+
+#: src/mn-main-window.c:540
+msgid "unable to load toolbars.xml"
+msgstr "incapaz de carregar barras de ferramentas.xml"
+
 #: src/mn-main.c:99
 #, c-format
 msgid "Compiled-in mailbox backends: %s\n"
 msgstr "Backends mailbox compilados: %s\n"
 
+#: src/mn-main.c:113
+msgid "Gmail timestamps"
+msgstr "timestamps do Gmail"
+
 #: src/mn-main.c:116
 #, c-format
 msgid "Compiled-in features: %s\n"
 msgstr "Características compiladas: %s\n"
 
-#: src/mn-main.c:175
+#: src/mn-main.c:176
 msgid "Enable informational output"
 msgstr "Activar output informacional"
 
-#: src/mn-main.c:184
-msgid "List compiled-in features and exit"
-msgstr "Listar características compiladas e sair"
+#: src/mn-main.c:185
+msgid "List the compiled-in features"
+msgstr "Listar características compiladas"
 
-#: src/mn-main.c:193
-msgid "Display the mail summary dialog"
-msgstr "Mostrar o diálogo de resumo de correio"
+#: src/mn-main.c:194
+msgid "Display the main window"
+msgstr "Mostrar a janela principal"
 
-#: src/mn-main.c:202
+#: src/mn-main.c:203
 msgid "Display the properties dialog"
 msgstr "Mostrar o diálogo de propriedades"
 
-#: src/mn-main.c:211
+#: src/mn-main.c:212
 msgid "Display the about dialog"
 msgstr "Mostrar o diálogo Sobre"
 
-#: src/mn-main.c:220
+#: src/mn-main.c:221
 msgid "Close the mail summary popup"
 msgstr "Fechar o popup de resumo de correio"
 
-#: src/mn-main.c:229
-msgid "Update the mail status"
-msgstr "Actualizar o estado do correio"
-
-#: src/mn-main.c:238
+#: src/mn-main.c:239
 msgid "Report the mail status"
 msgstr "Relatar o estado do correio"
 
-#: src/mn-main.c:247
-msgid "Unset obsolete GConf configuration and exit"
-msgstr "Apagar configurações GConf obsoletas e sair"
+#: src/mn-main.c:248
+msgid "Unset obsolete GConf configuration"
+msgstr "Apagar configurações GConf obsoletas"
 
 #.
 #. * We can't use mn_error_dialog() because gtk_init() has not been
 #. * called yet.
 #.
-#: src/mn-main.c:273
+#: src/mn-main.c:284
 msgid "multi-threading is not available"
 msgstr "multi-threading não está disponível"
 
-#: src/mn-main.c:320
+#: src/mn-main.c:338
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
@@ -1122,19 +1349,27 @@ msgstr ""
 "Bonobo não conseguiu encontrar o objecto de automação. Por favor verifique a "
 "sua instalação de Notificação de Correio."
 
-#: src/mn-main.c:325
+#: src/mn-main.c:344
+msgid "quitting Mail Notification"
+msgstr "saindo da Notificação de Correio"
+
+#: src/mn-main.c:348
+msgid "Mail Notification is not running"
+msgstr "Notificação de Correio não está a ser executado"
+
+#: src/mn-main.c:355
 msgid "Unable to initialize the GnomeVFS library."
 msgstr "Incapaz de inicializar a biblioteca GnomeVFS."
 
-#: src/mn-main.c:361
+#: src/mn-main.c:391
 msgid "updating the mail status"
 msgstr "actualizando o estado do correio"
 
-#: src/mn-main.c:379
+#: src/mn-main.c:409
 msgid "Mail Notification is already running"
 msgstr "Notificação de Correio já está a ser executado"
 
-#: src/mn-main.c:386
+#: src/mn-main.c:417
 msgid ""
 "Bonobo could not locate the GNOME_MailNotification_Automation.server file. "
 "Please check your Mail Notification installation."
@@ -1142,7 +1377,7 @@ msgstr ""
 "Bonobo não conseguiu encontrar o ficheiro GNOME_MailNotification_Automation."
 "server. Por favor verifique a sua instalação da Notificação de Correio."
 
-#: src/mn-main.c:390
+#: src/mn-main.c:421
 msgid ""
 "Bonobo was unable to register the automation server. Please check your Mail "
 "Notification installation."
@@ -1150,81 +1385,80 @@ msgstr ""
 "Bonobo foi incapaz de registar o servidor de automação. Por favor verifique "
 "a sua instalação da Notificação de Correio."
 
-#: src/mn-mbox-mailbox.gob:221
-#, c-format
-msgid "error while reading mailbox: %s"
-msgstr "erro ao ler a caixa de correio: %s"
-
-#: src/mn-mbox-mailbox.gob:230
+#: src/mn-mbox-mailbox.gob:184
 #, c-format
 msgid "unable to open mailbox: %s"
 msgstr "erro ao abrir a caixa de correio: %s"
 
-#: src/mn-message-box.gob:64
+#: src/mn-message-mime.c:105
+msgid "unable to parse MIME message"
+msgstr "incapaz de processar mensagem MIME"
+
+#: src/mn-message-view.gob:81
+msgid "You have no new mail."
+msgstr "Não tem correio novo."
+
+#: src/mn-message-view.gob:321
 msgid "Unreadable message"
 msgstr "Mensagem ilegível"
 
-#: src/mn-message-box.gob:69
+#: src/mn-message-view.gob:329
 msgid "From"
 msgstr "De"
 
-#: src/mn-message-box.gob:70
+#: src/mn-message-view.gob:337
 msgid "Subject"
 msgstr "Assunto"
 
-#: src/mn-message-box.gob:75
+#: src/mn-message-view.gob:348
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/mn-message-box.gob:192
+#: src/mn-message.gob:101
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: src/mn-message.gob:126
 #, c-format
 msgid "%i second ago"
 msgid_plural "%i seconds ago"
 msgstr[0] "%i segundo atrás"
 msgstr[1] "%i segundos atrás"
 
-#: src/mn-message-box.gob:196
+#: src/mn-message.gob:130
 #, c-format
-msgid "%i minute ago"
-msgid_plural "%i minutes ago"
-msgstr[0] "%i minuto atrás"
-msgstr[1] "%i minutos atrás"
+msgid "about %i minute ago"
+msgid_plural "about %i minutes ago"
+msgstr[0] "há cerca de %i minuto atrás"
+msgstr[1] "há cerca de %i minutos atrás"
 
-#: src/mn-message-box.gob:201
+#: src/mn-message.gob:135
 #, c-format
-msgid "%i hour ago"
-msgid_plural "%i hours ago"
-msgstr[0] "%i hora atrás"
-msgstr[1] "%i horas atrás"
+msgid "about %i hour ago"
+msgid_plural "about %i hours ago"
+msgstr[0] "há cerca de %i hora atrás"
+msgstr[1] "há cerca de %i horas atrás"
 
-#: src/mn-message-box.gob:206
+#: src/mn-message.gob:140
 #, c-format
-msgid "%i day ago"
-msgid_plural "%i days ago"
-msgstr[0] "%i dia atrás"
-msgstr[1] "%i dias atrás"
+msgid "about %i day ago"
+msgid_plural "about %i days ago"
+msgstr[0] "há cerca de %i dia atrás"
+msgstr[1] "há cerca de %i dias atrás"
 
-#: src/mn-message-box.gob:211
+#: src/mn-message.gob:145
 #, c-format
-msgid "%i week ago"
-msgid_plural "%i weeks ago"
-msgstr[0] "%i semana atrás"
-msgstr[1] "%i semanas atrás"
-
-#: src/mn-message-mime.c:105
-msgid "unable to parse MIME message"
-msgstr "incapaz de processar mensagem MIME"
+msgid "about %i week ago"
+msgid_plural "about %i weeks ago"
+msgstr[0] "há cerca de %i semana atrás"
+msgstr[1] "há cerca de %i semanas atrás"
 
-#: src/mn-message.gob:101
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: src/mn-mh-mailbox.gob:184
+#: src/mn-mh-mailbox.gob:147
 #, c-format
 msgid "error while reading .mh_sequences: %s"
 msgstr "erro ao ler .mh_sequences: %s"
 
-#: src/mn-mh-mailbox.gob:196
+#: src/mn-mh-mailbox.gob:157
 #, c-format
 msgid "unable to open .mh_sequences: %s"
 msgstr "erro ao abrir .mh_sequences: %s"
@@ -1233,23 +1467,23 @@ msgstr "erro ao abrir .mh_sequences: %s"
 msgid "detecting"
 msgstr "detectando"
 
-#: src/mn-pi-mailbox-properties.gob:76
+#: src/mn-pi-mailbox-properties.gob:75
 msgid "_Hostname:"
 msgstr "_Hostname:"
 
-#: src/mn-pi-mailbox-properties.gob:94
+#: src/mn-pi-mailbox-properties.gob:93
 msgid "_Details"
 msgstr "_Detalhes"
 
-#: src/mn-pi-mailbox-properties.gob:106
+#: src/mn-pi-mailbox-properties.gob:105
 msgid "sta_ndard"
 msgstr "sta_ndard"
 
-#: src/mn-pi-mailbox-properties.gob:116
+#: src/mn-pi-mailbox-properties.gob:115
 msgid "_in-band SSL/TLS"
 msgstr "SSL/TLS _in-band"
 
-#: src/mn-pi-mailbox-properties.gob:126
+#: src/mn-pi-mailbox-properties.gob:125
 msgid "SSL/TLS on sepa_rate port"
 msgstr "SSL/TLS num porto sepa_rado"
 
@@ -1273,77 +1507,77 @@ msgstr ""
 msgid "The port number of the POP3 server"
 msgstr "O número do porto do servidor POP3"
 
-#: src/mn-pop3-mailbox.gob:273
+#: src/mn-pop3-mailbox.gob:266
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr "argumentos inválidos para a habilidade LOGIN-DELAY"
 
-#: src/mn-pop3-mailbox.gob:590
+#: src/mn-pop3-mailbox.gob:569
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: src/mn-pop3-mailbox.gob:729
+#: src/mn-pop3-mailbox.gob:656
 #, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
 msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
 msgstr[0] "honrando LOGIN-DELAY, dormindo por %i segundo"
 msgstr[1] "honrando LOGIN-DELAY, dormindo por %i segundos"
 
-#: src/mn-pop3-mailbox.gob:893
+#: src/mn-pop3-mailbox.gob:849
 msgid "server does not support APOP authentication"
 msgstr "servidor não suporta autenticação APOP"
 
-#: src/mn-pop3-mailbox.gob:922
+#: src/mn-pop3-mailbox.gob:884
 msgid "falling back to APOP authentication"
 msgstr "recorrendo a autenticação APOP"
 
-#: src/mn-pop3-mailbox.gob:927
+#: src/mn-pop3-mailbox.gob:889
 msgid "falling back to USER/PASS authentication"
 msgstr "recorrendo a autenticação USER/PASS"
 
-#: src/mn-properties.c:193
+#: src/mn-properties-dialog.c:218
 msgid "top left"
 msgstr "topo esquerdo"
 
-#: src/mn-properties.c:194
+#: src/mn-properties-dialog.c:219
 msgid "top right"
 msgstr "topo direito"
 
-#: src/mn-properties.c:195
+#: src/mn-properties-dialog.c:220
 msgid "bottom left"
 msgstr "fundo esquerdo"
 
-#: src/mn-properties.c:196
+#: src/mn-properties-dialog.c:221
 msgid "bottom right"
 msgstr "fundo direito"
 
-#: src/mn-properties.c:287
+#: src/mn-properties-dialog.c:323
 msgid "No mailbox selected."
 msgstr "Nenhuma caixa de correio seleccionada."
 
-#: src/mn-properties.c:292
+#: src/mn-properties-dialog.c:328
 #, c-format
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
 msgstr[0] "%i caixa de correio seleccionada."
 msgstr[1] "%i caixas de correio seleccionadas."
 
-#: src/mn-shell.gob:93
+#: src/mn-shell.gob:96
 msgid "You have new mail."
 msgstr "Tem novo correio."
 
-#: src/mn-shell.gob:360
+#: src/mn-shell.gob:361
 msgid "Mailboxes Having New Mail"
 msgstr "Caixas de Correio Com Novo Correio"
 
-#: src/mn-shell.gob:362
+#: src/mn-shell.gob:382
 msgid "Errors"
 msgstr "Erros"
 
-#: src/mn-shell.gob:364
+#: src/mn-shell.gob:403
 msgid "Unsupported Mailboxes"
 msgstr "Caixas de Correio Não Suportadas"
 
-#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:418
 msgid "Mail Summary"
 msgstr "Resumo de Correio"
 
@@ -1361,20 +1595,20 @@ msgid "Select _All"
 msgstr "Seleccionar _Todas"
 
 #: src/mn-stock.c:29
-msgid "_Mail Summary"
-msgstr "_Resumo de Correio"
+msgid "Leave Fullscreen"
+msgstr "Sair de Ecrã Inteiro"
 
-#: src/mn-sylpheed-mailbox.gob:119
+#: src/mn-sylpheed-mailbox.gob:113
 #, c-format
 msgid "unable to open folder: %s"
 msgstr "incapaz de abrir pasta: %s"
 
-#: src/mn-sylpheed-mailbox.gob:165
+#: src/mn-sylpheed-mailbox.gob:147
 #, c-format
 msgid "unable to close folder: %s"
 msgstr "incapaz de fechar pasta: %s"
 
-#: src/mn-sylpheed-mailbox.gob:168
+#: src/mn-sylpheed-mailbox.gob:150
 #, c-format
 msgid "error while reading folder: %s"
 msgstr "erro ao ler pasta: %s"
@@ -1406,100 +1640,108 @@ msgstr "A razão pela qual a caixa de correio não é suportada"
 msgid "unsupported"
 msgstr "não suportado"
 
-#: src/mn-util.c:233
+#: src/mn-util.c:245
 #, c-format
 msgid "error loading image: %s"
 msgstr "erro ao carregar imagem: %s"
 
-#: src/mn-util.c:271
+#: src/mn-util.c:276
 #, c-format
 msgid "widget \"%s\" not found in interface \"%s\""
 msgstr "widget \"%s\" não foi encontrada na interface \"%s\""
 
-#: src/mn-util.c:385
+#: src/mn-util.c:390
 msgid "received an invalid URI list"
 msgstr "recebida uma lista de URIs inválida"
 
-#: src/mn-util.c:421
+#: src/mn-util.c:426
 msgid "received an invalid Mozilla URL"
 msgstr "recebido um URL Mozilla inválido"
 
-#: src/mn-util.c:514
+#: src/mn-util.c:519
 msgid "Unable to display help"
 msgstr "Incapaz de mostrar ajuda"
 
-#: src/mn-util.c:528
+#: src/mn-util.c:533
 #, c-format
 msgid "Unable to create a thread: %s."
 msgstr "Incapaz de criar uma thread: %s."
 
-#: src/mn-util.c:705
+#: src/mn-util.c:626
 msgid "_Do not show this message again"
 msgstr "_Não mostrar esta mensagem de novo"
 
-#: src/mn-util.c:789
+#: src/mn-util.c:710
 msgid "A fatal error has occurred in Mail Notification"
 msgstr "Ocorreu um erro fatal na Notificação de Correio"
 
-#: src/mn-util.c:804
+#: src/mn-util.c:725
 #, c-format
 msgid "unable to get current time: %s"
 msgstr "incapaz de obter tempo actual: %s"
 
-#: src/mn-util.c:906
+#: src/mn-util.c:787
 #, c-format
 msgid "invalid signal specification \"%s\""
 msgstr "especificação de sinal inválida \"%s\""
 
-#: src/mn-util.c:945
+#: src/mn-util.c:826
 msgid "A command error has occurred in Mail Notification"
 msgstr "Ocorreu um erro de comando na Notificação de Correio"
 
-#: src/mn-util.c:946
+#: src/mn-util.c:827
 #, c-format
 msgid "Unable to execute \"%s\": %s."
 msgstr "incapaz de executar \"%s\": %s."
 
 #: ui/authentication.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ui/authentication.glade.h:2
 msgid "_Authenticate"
 msgstr "_Autenticar"
 
+#: ui/edit-toolbars.glade.h:1
+msgid "Edit Toolbars"
+msgstr "Editar Barras de Ferramentas"
+
+#: ui/edit-toolbars.glade.h:2
+msgid "_Add a New Toolbar"
+msgstr "_Adicionar Nova Barra"
+
+#: ui/edit-toolbars.glade.h:3
+msgid "_Use Default"
+msgstr "_Usar Omissão"
+
 #: ui/mailbox-properties.glade.h:1
 msgid "_Mailbox type:"
 msgstr "_Tipo de caixa de correio:"
 
 #: ui/properties.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: ui/properties.glade.h:2
 msgid "<span weight=\"bold\">Commands</span>"
 msgstr "<span weight=\"bold\">Comandos</span>"
 
-#: ui/properties.glade.h:3
+#: ui/properties.glade.h:2
 msgid "<span weight=\"bold\">Double-click Action</span>"
 msgstr "<span weight=\"bold\">Acção de Duplo-Clique</span>"
 
-#: ui/properties.glade.h:4
+#: ui/properties.glade.h:3
 msgid "<span weight=\"bold\">Fonts</span>"
 msgstr "<span weight=\"bold\">Fontes</span>"
 
-#: ui/properties.glade.h:5
+#: ui/properties.glade.h:4
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Geral</span>"
 
-#: ui/properties.glade.h:6
+#: ui/properties.glade.h:5
 msgid "<span weight=\"bold\">Mailbox List</span>"
 msgstr "<span weight=\"bold\">Lista de Caixas de Correio</span>"
 
-#: ui/properties.glade.h:7
+#: ui/properties.glade.h:6
 msgid "<span weight=\"bold\">Position</span>"
 msgstr "<span weight=\"bold\">Posição</span>"
 
+#: ui/properties.glade.h:7
+msgid "Co_ntents:"
+msgstr "Co_nteúdos:"
+
 #: ui/properties.glade.h:8
 msgid "Dis_play mail summary in tooltip"
 msgstr "_Mostrar o resumo de correio numa dica"
@@ -1570,49 +1812,53 @@ msgstr ""
 "resumo de correio"
 
 #: ui/properties.glade.h:23
+msgid "Use these _fonts:"
+msgstr "Usar estas _fontes:"
+
+#: ui/properties.glade.h:24
 msgid "When _all mail is read:"
 msgstr "Quando _todo o correio está lido:"
 
-#: ui/properties.glade.h:24
+#: ui/properties.glade.h:25
 msgid "When _new mail arrives:"
 msgstr "Quando chega _novo correio:"
 
-#: ui/properties.glade.h:25
+#: ui/properties.glade.h:26
 msgid "Whether the status icon should blink on errors or not"
 msgstr "Se o ícone de estado deve piscar em erros ou não"
 
-#: ui/properties.glade.h:26
+#: ui/properties.glade.h:27
 msgid "Whether to automatically close the mail summary popup or not"
 msgstr ""
 "Se o popup de resumo de correio deve ser automaticamente fechado ou não"
 
-#: ui/properties.glade.h:27
+#: ui/properties.glade.h:28
 msgid "Whether to display the mail summary in the status icon tooltip or not"
 msgstr ""
 "Se o resumo de correio deve ser mostrado na dica do ícone de estado ou não"
 
-#: ui/properties.glade.h:28
+#: ui/properties.glade.h:29
 msgid "Whether to display the mail summary popup when new mail arrives or not"
 msgstr ""
 "Se o popup de resumo de correio deve ser mostrado quando chega correio ou não"
 
-#: ui/properties.glade.h:29
+#: ui/properties.glade.h:30
 msgid "Whether to hide previously displayed mail or not"
 msgstr "Se o correio mostrado previamente deve ser escondido ou não"
 
-#: ui/properties.glade.h:30
+#: ui/properties.glade.h:31
 msgid "Whether to run a command when all mail is read or not"
 msgstr "Se deve ser executado um comando quando todo o correio está lido"
 
-#: ui/properties.glade.h:31
+#: ui/properties.glade.h:32
 msgid "Whether to run a command when new mail arrives or not"
 msgstr "Se deve ser executado um comando quando chega novo correio"
 
-#: ui/properties.glade.h:32
+#: ui/properties.glade.h:33
 msgid "Whether to set a mail reader or not"
 msgstr "Se deve ser definido um leitor de correio ou não"
 
-#: ui/properties.glade.h:33
+#: ui/properties.glade.h:34
 msgid ""
 "Whether to start Mail Notification when you log into your GNOME session or "
 "not"
@@ -1620,60 +1866,49 @@ msgstr ""
 "Se a Notificação de Correio deve ser iniciada quando faz se liga à sessão "
 "GNOME ou não"
 
-#: ui/properties.glade.h:34
-msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
-"not"
-msgstr ""
-"Se deve ser usada uma fonte personalizada para o conteúdo do popup de resumo "
-"de correio ou não"
-
 #: ui/properties.glade.h:35
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not"
-msgstr ""
-"Se deve ser usada uma fonte personalizada para o título do popup de resumo "
-"de correio ou não"
-
-#: ui/properties.glade.h:36
 msgid "_Automatically close after:"
 msgstr "Fechar _Automáticamente após:"
 
-#: ui/properties.glade.h:37
+#: ui/properties.glade.h:36
 msgid "_Blink on errors"
 msgstr "_Piscar em erros"
 
-#: ui/properties.glade.h:38
-msgid "_Contents font:"
-msgstr "Fonte do conteúdo:"
-
-#: ui/properties.glade.h:39
+#: ui/properties.glade.h:37
 msgid "_Delay between mail checks:"
 msgstr "_Intervalo entre verificações de correio:"
 
-#: ui/properties.glade.h:40
-msgid "_Display the mail summary dialog"
-msgstr "_Mostrar o diálogo de resumo de correio"
+#: ui/properties.glade.h:38
+msgid "_Display the main window"
+msgstr "_Mostrar a janela principal"
 
-#: ui/properties.glade.h:41
+#: ui/properties.glade.h:39
 msgid "_Enable mail summary popup"
 msgstr "_Activar popup de resumo de correio"
 
-#: ui/properties.glade.h:42
+#: ui/properties.glade.h:40
 msgid "_Launch the mail reader"
 msgstr "_Lançar o leitor de correio"
 
-#: ui/properties.glade.h:43
+#: ui/properties.glade.h:41
 msgid "_Mail reader:"
 msgstr "_Leitor de correio:"
 
-#: ui/properties.glade.h:44
+#: ui/properties.glade.h:42
 msgid "_Start Mail Notification on GNOME login"
 msgstr "_Iniciar Notificação de Correio no login GNOME"
 
+#: ui/properties.glade.h:43
+msgid "_Title:"
+msgstr "_Título:"
+
+#: ui/properties.glade.h:44
+msgid "_Update the mail status"
+msgstr "_Actualizar o estado do correio"
+
 #: ui/properties.glade.h:45
-msgid "_Title font:"
-msgstr "Fonte para o _título:"
+msgid "_Use fonts from theme"
+msgstr "_Usar fontes do tema"
 
 #: ui/properties.glade.h:46
 msgid "_Vertical offset:"
@@ -1701,7 +1936,7 @@ msgid ""
 "\n"
 "Mail Notification has been loaded successfully.\n"
 "\n"
-"Since this is the first time you run Mail Notification, you might want to "
+"Since this is the first time you run Mail Notification, you need to "
 "configure it.\n"
 "\n"
 "Note: this message will not be shown anymore. To configure Mail Notification "
@@ -1714,8 +1949,8 @@ msgstr ""
 "\n"
 "A Notificação de Correio foi carregada com sucesso.\n"
 "\n"
-"Como esta é a primeira vez que executa a Notificação de Correio, talvez "
-"queira configurá-la.\n"
+"Como esta é a primeira vez que executa a Notificação de Correio, precisa de "
+"a configurar.\n"
 "\n"
 "Nota: esta mensagem não será mostrada de novo. Para configurar a Notificação "
 "de Correio outra vez, escolha <span weight=\"bold\">Aplicações</span> → "
@@ -1732,14 +1967,77 @@ msgstr "_Configurar Notificação de Correio"
 msgid "_Skip configuration"
 msgstr "_Saltar configuração"
 
+#~ msgid "received non-ASCII data from server"
+#~ msgstr "dados não-ASCII recebidos do servidor"
+
+#~ msgid "Use a custom font for the contents of the mail summary popup"
+#~ msgstr ""
+#~ "Usar uma fonte personalizada para o conteúdo do popup de resumo de correio"
+
+#~ msgid "Use a custom font for the title of the mail summary popup"
+#~ msgstr ""
+#~ "Usar uma fonte personalizada para o título do popup de resumo de correio"
+
+#~ msgid ""
+#~ "Whether to use a custom font for the contents of the mail summary popup "
+#~ "or not."
+#~ msgstr ""
+#~ "Se deve ser usada uma fonte personalizada para o conteúdo do popup de "
+#~ "resumo de correio ou não."
+
+#~ msgid ""
+#~ "Whether to use a custom font for the title of the mail summary popup or "
+#~ "not."
+#~ msgstr ""
+#~ "Se deve ser usada uma fonte personalizada para o título do popup de "
+#~ "resumo de correio ou não."
+
+#~ msgid "server did not send status"
+#~ msgstr "servidor não enviou estado"
+
+#~ msgid "_Launch Mail Reader"
+#~ msgstr "_Lançar Leitor de Correio"
+
+#~ msgid "Whether the mailbox has new mail or not"
+#~ msgstr "Se a caixa de correio tem novo correio"
+
+#~ msgid "%s has no new mail"
+#~ msgstr "%s não tem correio novo"
+
+#~ msgid "Display the mail summary dialog"
+#~ msgstr "Mostrar o diálogo de resumo de correio"
+
+#~ msgid "error while reading mailbox: %s"
+#~ msgstr "erro ao ler a caixa de correio: %s"
+
+#~ msgid "_Mail Summary"
+#~ msgstr "_Resumo de Correio"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid ""
+#~ "Whether to use a custom font for the contents of the mail summary popup "
+#~ "or not"
+#~ msgstr ""
+#~ "Se deve ser usada uma fonte personalizada para o conteúdo do popup de "
+#~ "resumo de correio ou não"
+
+#~ msgid ""
+#~ "Whether to use a custom font for the title of the mail summary popup or "
+#~ "not"
+#~ msgstr ""
+#~ "Se deve ser usada uma fonte personalizada para o título do popup de "
+#~ "resumo de correio ou não"
+
 #~ msgid "The following mailbox has new mail:\n"
 #~ msgid_plural "The following mailboxes have new mail:\n"
 #~ msgstr[0] "A seguinte caixa de correio tem novo correio:\n"
 #~ msgstr[1] "As seguintes caixas de correio têm novo correio:\n"
 
-#~ msgid "You have no new mail."
-#~ msgstr "Não tem correio novo."
-
 #~ msgid "The following mailbox reported an error:\n"
 #~ msgid_plural "The following mailboxes reported an error:\n"
 #~ msgstr[0] "A seguinte caixa de correio relatou um erro:\n"
diff --git a/po/ru.gmo b/po/ru.gmo
Binary files differ.
diff --git a/po/ru.po b/po/ru.po
@@ -1,5 +1,5 @@
 # Russian translations for mail-notification.
-# Copyright (c) 2003, 2004 Jean-Yves Lefort.
+# Copyright (C) 2003, 2004 Jean-Yves Lefort.
 #
 # This file is distributed under the same license as the
 # mail-notification package.
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mail-notification 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-25 01:43+0100\n"
+"POT-Creation-Date: 2005-03-02 02:32+0100\n"
 "PO-Revision-Date: 2004-07-21 21:58+0200\n"
 "Last-Translator: Dan Korostelev <dan@ats.energo.ru>\n"
 "Language-Team: Russian\n"
@@ -30,15 +30,15 @@ msgstr "Иконка входящих сообщений"
 msgid "Mail Notification automation factory"
 msgstr "Иконка входящих сообщений"
 
-#: data/mail-notification-properties.desktop.in.h:1
+#: data/mail-notification-properties.desktop.in.h:1 src/mn-main-window.c:145
 #, fuzzy
 msgid "Configure Mail Notification"
 msgstr "Иконка входящих сообщений"
 
 #: data/mail-notification-properties.desktop.in.h:2
 #: data/mail-notification.desktop.in.h:2
-#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:40
-#: src/mn-mail-icon.gob:194 src/mn-main.c:281
+#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:39
+#: src/mn-mail-icon.gob:224 src/mn-main.c:292 ui/main.glade.h:1
 msgid "Mail Notification"
 msgstr "Иконка входящих сообщений"
 
@@ -88,263 +88,292 @@ msgid "Has already been run"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:11
-msgid "Height of mail summary dialog"
+msgid "Height of edit toolbars dialog"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:12
-msgid "Height of properties dialog"
+msgid "Height of main window"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:13
-msgid "Mail read command"
+msgid "Height of properties dialog"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:14
-msgid "Mail reader command"
+msgid "Mail read command"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:15
-msgid "Mail summary popup contents font"
+msgid "Mail reader command"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:16
-msgid "Mail summary popup horizontal offset"
+msgid "Mail summary popup contents font"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:17
-msgid "Mail summary popup position"
+msgid "Mail summary popup fonts aspect source"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:18
-msgid "Mail summary popup title font"
+msgid "Mail summary popup horizontal offset"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:19
-msgid "Mail summary popup vertical offset"
+msgid "Mail summary popup position"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:20
-msgid "Mailbox list"
+msgid "Mail summary popup title font"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:21
-msgid "Minutes between mail checks"
+msgid "Mail summary popup vertical offset"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:22
-msgid "Minutes to wait before closing the mail summary popup"
+msgid "Mailbox list"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:23
-msgid "New mail command"
+msgid "Minutes between mail checks"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:24
-msgid "Only display recent mail in mail summary popup"
+msgid "Minutes to wait before closing the mail summary popup"
 msgstr ""
 
 #: data/mail-notification.schemas.in.h:25
+msgid "New mail command"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:26
+msgid "Only display recent mail in mail summary popup"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:27
 #, fuzzy
 msgid "Run a command when all mail is read"
 msgstr ""
 "Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:28
 #, fuzzy
 msgid "Run a command when new mail arrives"
 msgstr ""
 "Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: data/mail-notification.schemas.in.h:27
+#: data/mail-notification.schemas.in.h:29
 msgid "Seconds between mail checks"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:30
 msgid "Seconds to wait before closing the mail summary popup"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:29
+#: data/mail-notification.schemas.in.h:31
 msgid "Set a mail reader"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:32
 msgid ""
 "The action to perform when the icon is double-clicked. Must be \"display-"
-"mail-summary\" or \"launch-mail-reader\"."
+"main-window\", \"launch-mail-reader\" or \"update-mail-status\"."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:33
 msgid ""
 "The amount of time to wait before closing the mail summary popup (minutes "
 "part)."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:34
 msgid ""
 "The amount of time to wait before closing the mail summary popup (seconds "
 "part)."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:35
+msgid ""
+"The aspect source of the mail summary popup fonts. Must be \"theme\" or "
+"\"custom\"."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:36
 #, fuzzy
 msgid "The command to run to launch the mail reader."
 msgstr ""
 "Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:37
 #, fuzzy
 msgid "The command to run when all mail is read."
 msgstr ""
 "Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:38
 #, fuzzy
 msgid "The command to run when new mail arrives."
 msgstr ""
 "Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:39
 msgid "The custom font to use for the contents of the mail summary popup."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:40
 msgid "The custom font to use for the title of the mail summary popup."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:38
-msgid "The height of the mail summary dialog in pixels."
+#: data/mail-notification.schemas.in.h:41
+msgid "The height of the edit toolbars dialog in pixels."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:42
+msgid "The height of the main window in pixels."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:43
 msgid "The height of the properties dialog in pixels."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:44
 msgid "The list of mailboxes to monitor."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:45
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:46
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:47
 msgid ""
 "The number of pixels to leave between the left or right side of the screen "
 "and the mail summary popup."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:48
 msgid ""
 "The number of pixels to leave between the top or bottom side of the screen "
 "and the mail summary popup."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:49
 msgid ""
 "The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
 "\"bottom-left\" or \"bottom-right\"."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:46
-msgid "The width of the mail summary dialog in pixels."
+#: data/mail-notification.schemas.in.h:50
+msgid ""
+"The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text\", "
+"\"both\" or \"both-horiz\"."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:51
+msgid "The width of the edit toolbars dialog in pixels."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:52
+msgid "The width of the main window in pixels."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:53
 msgid "The width of the properties dialog in pixels."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:54
+msgid "Toolbars style"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:55
 msgid "Trusted servers list"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:49
-msgid "Use a custom font for the contents of the mail summary popup"
+#: data/mail-notification.schemas.in.h:56
+msgid "View statusbar"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:50
-msgid "Use a custom font for the title of the mail summary popup"
+#: data/mail-notification.schemas.in.h:57
+msgid "View toolbars"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:58
 msgid "Whether Mail Notification has already been run or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:59
 msgid "Whether the status icon should blink on errors or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:60
+msgid "Whether the statusbar should be visible or not."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:61
+msgid "Whether the toolbars should be visible or not."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:62
 #, fuzzy
 msgid "Whether to automatically close the mail summary popup or not."
 msgstr ""
 "Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:63
 msgid "Whether to display the mail summary in the status icon tooltip or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:64
 #, fuzzy
 msgid "Whether to display the mail summary popup when new mail arrives or not."
 msgstr ""
 "Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:65
 msgid ""
 "Whether to hide previously displayed mail in the mail summary popup or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:66
 msgid ""
 "Whether to prevent the immediate notification error dialog from being "
 "displayed or not."
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:67
 #, fuzzy
 msgid "Whether to run a command when all mail is read or not."
 msgstr ""
 "Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:68
 #, fuzzy
 msgid "Whether to run a command when new mail arrives or not."
 msgstr ""
 "Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:69
 #, fuzzy
 msgid "Whether to set a mail reader or not."
 msgstr ""
 "Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: data/mail-notification.schemas.in.h:61
-#, fuzzy
-msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
-"not."
-msgstr ""
-"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-
-#: data/mail-notification.schemas.in.h:62
-#, fuzzy
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not."
+#: data/mail-notification.schemas.in.h:70
+msgid "Width of edit toolbars dialog"
 msgstr ""
-"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: data/mail-notification.schemas.in.h:63
-msgid "Width of mail summary dialog"
+#: data/mail-notification.schemas.in.h:71
+msgid "Width of main window"
 msgstr ""
 
-#: data/mail-notification.schemas.in.h:64
+#: data/mail-notification.schemas.in.h:72
 msgid "Width of properties dialog"
 msgstr ""
 
@@ -352,6 +381,20 @@ msgstr ""
 msgid "New Mail"
 msgstr ""
 
+#: src/egg-editable-toolbar.c:536
+msgid "_Remove Toolbar"
+msgstr ""
+
+#: src/egg-toolbar-editor.c:558
+msgid "Separator"
+msgstr ""
+
+#: src/egg-toolbar-editor.c:588
+msgid ""
+"Drag an item onto the toolbars above to add it, from the toolbars in the "
+"items table to remove it."
+msgstr ""
+
 #: src/eggtrayicon.c:109
 msgid "Orientation"
 msgstr ""
@@ -360,20 +403,20 @@ msgstr ""
 msgid "The orientation of the tray."
 msgstr ""
 
-#: src/mn-about-dialog.gob:43
+#: src/mn-about-dialog.gob:42
 msgid "A Mail Notification Icon"
 msgstr ""
 
 #. translator: replace with your name and email
-#: src/mn-about-dialog.gob:47
+#: src/mn-about-dialog.gob:46
 msgid "Jean-Yves Lefort <jylefort@brutele.be>"
 msgstr "Dan Korostelev <dan@ats.energo.ru>"
 
-#: src/mn-auth-combo-box.gob:101 src/mn-autodetect-mailbox-properties.gob:37
+#: src/mn-auth-combo-box.gob:102 src/mn-autodetect-mailbox-properties.gob:39
 msgid "<span style=\"italic\">autodetect</span>"
 msgstr ""
 
-#: src/mn-authenticated-mailbox.gob:80
+#: src/mn-authenticated-mailbox.gob:85
 #, c-format
 msgid ""
 "Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -382,12 +425,12 @@ msgid ""
 "Please re-enter your password."
 msgstr ""
 
-#: src/mn-authenticated-mailbox.gob:81
+#: src/mn-authenticated-mailbox.gob:86
 #, c-format
 msgid "Enter your password for %s mailbox %s."
 msgstr ""
 
-#: src/mn-authenticated-mailbox.gob:132
+#: src/mn-authenticated-mailbox.gob:137
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Mail Notification requires a password</"
@@ -396,11 +439,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/mn-autodetect-mailbox-properties.gob:68
+#: src/mn-autodetect-mailbox-properties.gob:70
 msgid "_Location:"
 msgstr ""
 
-#: src/mn-autodetect-mailbox-properties.gob:74
+#: src/mn-autodetect-mailbox-properties.gob:76
 msgid "_Browse..."
 msgstr ""
 
@@ -408,7 +451,7 @@ msgstr ""
 msgid "The URI of the mailbox"
 msgstr ""
 
-#: src/mn-autodetect-mailbox-properties.gob:118
+#: src/mn-autodetect-mailbox-properties.gob:123
 msgid "Select a File or Folder"
 msgstr ""
 
@@ -538,156 +581,188 @@ msgstr ""
 msgid "unable to decode data using SASL: %s"
 msgstr ""
 
-#: src/mn-client-session.c:746
+#: src/mn-client-session.c:743
 #, c-format
 msgid "unable to encode data using SASL: %s"
 msgstr ""
 
-#: src/mn-client-session.c:777 src/mn-client-session.c:784
+#: src/mn-client-session.c:774 src/mn-client-session.c:781
 #, c-format
 msgid "unable to write to server: %s"
 msgstr ""
 
-#: src/mn-client-session.c:782
+#: src/mn-client-session.c:779
 msgid "unable to write to server: EOF"
 msgstr ""
 
-#: src/mn-client-session.c:814
+#: src/mn-client-session.c:811
 #, c-format
 msgid "unable to encode Base64: %s"
 msgstr ""
 
-#: src/mn-client-session.c:925
+#: src/mn-client-session.c:922
 #, c-format
 msgid "unable to initialize the SASL library: %s"
 msgstr ""
 
-#: src/mn-client-session.c:934
+#: src/mn-client-session.c:931
 #, c-format
 msgid "unable to retrieve local address of socket: %s"
 msgstr ""
 
-#: src/mn-client-session.c:940
+#: src/mn-client-session.c:937
 #, c-format
 msgid "unable to retrieve remote address of socket: %s"
 msgstr ""
 
-#: src/mn-client-session.c:974
+#: src/mn-client-session.c:971
 #, c-format
-msgid "warning: unable to set SASL security properties: %s"
+msgid "unable to set SASL security properties: %s"
 msgstr ""
 
-#: src/mn-client-session.c:998
+#: src/mn-client-session.c:995
 msgid ""
 "unable to start SASL authentication: SASL asked for something we did not know"
 msgstr ""
 
-#: src/mn-client-session.c:1017
+#: src/mn-client-session.c:1014
 #, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr ""
 
-#: src/mn-client-session.c:1021
+#: src/mn-client-session.c:1018
 #, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr ""
 
-#: src/mn-client-session.c:1058
+#: src/mn-client-session.c:1055
 msgid "SASL asked for something we did not know, aborting SASL authentication"
 msgstr ""
 
-#: src/mn-client-session.c:1075
+#: src/mn-client-session.c:1072
 #, c-format
 msgid "%s, aborting SASL authentication"
 msgstr ""
 
 #. compliance error
-#: src/mn-client-session.c:1080
+#: src/mn-client-session.c:1077
 #, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr ""
 
-#: src/mn-client-session.c:1083
+#: src/mn-client-session.c:1080
 msgid ""
 "the server sent a SASL challenge, but there was a pending initial SASL "
 "client response"
 msgstr ""
 
-#: src/mn-client-session.c:1097
+#: src/mn-client-session.c:1094
 msgid ""
 "the server did not send a SASL challenge, but there was no pending initial "
 "SASL client response"
 msgstr ""
 
-#: src/mn-client-session.c:1122
+#: src/mn-client-session.c:1119
 #, c-format
 msgid "a SASL security layer of strength factor %i is now active"
 msgstr ""
 
 #. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: src/mn-client-session.c:1127
+#: src/mn-client-session.c:1124
 #, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr ""
 
-#: src/mn-client-session.c:1133
+#: src/mn-client-session.c:1130
 #, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr ""
 
-#: src/mn-conf.c:145
+#: src/mn-conf.c:238
+msgid "A directory creation error has occurred"
+msgstr ""
+
+#: src/mn-conf.c:239
+#, c-format
+msgid "Unable to create directory \"%s\": %s."
+msgstr ""
+
+#: src/mn-conf.c:313
 #, c-format
 msgid "recursively unsetting %s"
 msgstr ""
 
-#: src/mn-conf.c:149
+#: src/mn-conf.c:317
 msgid "syncing the GConf database"
 msgstr ""
 
-#: src/mn-conf.c:152
+#: src/mn-conf.c:320
 msgid "completed"
 msgstr ""
 
-#: src/mn-gmail-mailbox-properties.gob:77
+#: src/mn-gmail-mailbox-properties.gob:76
 msgid "Your Gmail username"
 msgstr ""
 
-#: src/mn-gmail-mailbox-properties.gob:78
+#: src/mn-gmail-mailbox-properties.gob:77
 msgid ""
 "Your Gmail password (if left blank, you will be prompted for the password "
 "when needed)"
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:82
+#: src/mn-gmail-mailbox.gob:86
 msgid "libsoup has not been compiled with SSL/TLS support"
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:160
+#: src/mn-gmail-mailbox.gob:164
 #, c-format
 msgid "unable to parse URI \"%s\""
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:214
+#: src/mn-gmail-mailbox.gob:217
+msgid "received non-UTF-8 data from server"
+msgstr ""
+
+#: src/mn-gmail-mailbox.gob:224
 #, c-format
 msgid "unable to transfer data: %s"
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:335
+#: src/mn-gmail-mailbox.gob:345
 msgid "logging in"
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:413
+#: src/mn-gmail-mailbox.gob:423
 msgid "login failed"
 msgstr ""
 
-#: src/mn-gmail-mailbox.gob:488
+#: src/mn-gmail-mailbox.gob:496
 msgid "searching for unread mail"
 msgstr ""
 
 #: src/mn-gmail-mailbox.gob:527
+msgid "unable to initialize the ICU library"
+msgstr ""
+
+#: src/mn-gmail-mailbox.gob:554
 msgid "unable to parse Gmail data"
 msgstr ""
 
+#: src/mn-gmail-mailbox.gob:891
+#, c-format
+msgid "unable to open calendar: %s"
+msgstr ""
+
+#: src/mn-gmail-mailbox.gob:899
+#, c-format
+msgid "unable to set calendar time: %s"
+msgstr ""
+
+#: src/mn-gmail-mailbox.gob:968
+#, c-format
+msgid "unable to get calendar time: %s"
+msgstr ""
+
 #: src/mn-gmime-stream-vfs.gob:49
 #, c-format
 msgid "unable to read %s: %s"
@@ -713,19 +788,19 @@ msgstr ""
 msgid "unable to close %s: %s"
 msgstr ""
 
-#: src/mn-imap-mailbox-properties.gob:94
+#: src/mn-imap-mailbox-properties.gob:95
 msgid "Mailbox:"
 msgstr ""
 
-#: src/mn-imap-mailbox-properties.gob:98
+#: src/mn-imap-mailbox-properties.gob:99
 msgid "in_box"
 msgstr ""
 
-#: src/mn-imap-mailbox-properties.gob:109
+#: src/mn-imap-mailbox-properties.gob:110
 msgid "oth_er:"
 msgstr ""
 
-#: src/mn-imap-mailbox-properties.gob:121
+#: src/mn-imap-mailbox-properties.gob:122
 msgid "U_se idle mode if possible"
 msgstr ""
 
@@ -756,73 +831,72 @@ msgstr ""
 msgid "If possible, whether to use idle mode or not"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:166 src/mn-pop3-mailbox.gob:143
+#: src/mn-imap-mailbox.gob:156 src/mn-pop3-mailbox.gob:136
 msgid "SSL/TLS support has not been compiled in"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:246
+#: src/mn-imap-mailbox.gob:236
 msgid "server did not send capabilities"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:418
+#: src/mn-imap-mailbox.gob:408
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:419
+#: src/mn-imap-mailbox.gob:409
 msgid "unable to login"
 msgstr ""
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:571
+#: src/mn-imap-mailbox.gob:542
 msgid "server did not send search results"
 msgstr ""
 
 #. compliance error
-#: src/mn-imap-mailbox.gob:651
+#: src/mn-imap-mailbox.gob:617
 msgid "server did not send all the messages we requested"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:700
+#: src/mn-imap-mailbox.gob:671
 msgid "unable to fetch message"
 msgstr ""
 
-#. compliance error
-#: src/mn-imap-mailbox.gob:818
-msgid "server did not send status"
-msgstr ""
-
-#: src/mn-imap-mailbox.gob:1096 src/mn-pop3-mailbox.gob:972
+#: src/mn-imap-mailbox.gob:1006 src/mn-pop3-mailbox.gob:927
 msgid "unknown server error"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:1198 src/mn-pop3-mailbox.gob:227
+#: src/mn-imap-mailbox.gob:1108 src/mn-pop3-mailbox.gob:220
 msgid "server does not support in-band SSL/TLS"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:1217 src/mn-pop3-mailbox.gob:885
+#: src/mn-imap-mailbox.gob:1127 src/mn-pop3-mailbox.gob:837
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:1225 src/mn-pop3-mailbox.gob:897
+#: src/mn-imap-mailbox.gob:1137 src/mn-pop3-mailbox.gob:857
 #, c-format
 msgid "unknown authentication mechanism \"%s\""
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:1246
+#: src/mn-imap-mailbox.gob:1160
 msgid "falling back to IMAP LOGIN authentication"
 msgstr ""
 
-#: src/mn-imap-mailbox.gob:1257 src/mn-pop3-mailbox.gob:938
+#: src/mn-imap-mailbox.gob:1172 src/mn-pop3-mailbox.gob:901
 msgid "authentication failed"
 msgstr ""
 
-#: src/mn-mail-icon.gob:92 ui/summary-dialog.glade.h:2
-msgid "_Launch Mail Reader"
+#: src/mn-mail-icon.gob:91
+msgid "Main _Window"
+msgstr ""
+
+#: src/mn-mail-icon.gob:92 src/mn-main-window.c:101
+msgid "_Mail Reader"
 msgstr ""
 
-#: src/mn-mail-icon.gob:93 ui/summary-dialog.glade.h:3
+#: src/mn-mail-icon.gob:93 src/mn-main-window.c:109
 msgid "_Update"
 msgstr ""
 
@@ -830,20 +904,20 @@ msgstr ""
 msgid "R_emove From Notification Area"
 msgstr ""
 
-#: src/mn-mailbox-properties-dialog.c:109
+#: src/mn-mailbox-properties-dialog.c:156
 msgid "Add a Mailbox"
 msgstr ""
 
-#: src/mn-mailbox-properties-dialog.c:328
+#: src/mn-mailbox-properties-dialog.c:325
 #, c-format
 msgid "%s Properties"
 msgstr ""
 
-#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:4
+#: src/mn-mailbox-properties-util.c:77 ui/authentication.glade.h:3
 msgid "_Username:"
 msgstr ""
 
-#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:3
+#: src/mn-mailbox-properties-util.c:87 ui/authentication.glade.h:2
 msgid "_Password:"
 msgstr ""
 
@@ -883,61 +957,57 @@ msgstr ""
 msgid "Whether the properties are completely filled or not"
 msgstr ""
 
-#: src/mn-mailbox-view.gob:263 src/mn-message-box.gob:61
+#: src/mn-mailbox-view.gob:271 src/mn-message-view.gob:312
 msgid "Mailbox"
 msgstr ""
 
 #. format column
-#: src/mn-mailbox-view.gob:279
+#: src/mn-mailbox-view.gob:287
 msgid "Format"
 msgstr ""
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "Unable to add mailbox"
 msgstr ""
 
-#: src/mn-mailbox-view.gob:569
+#: src/mn-mailbox-view.gob:577
 msgid "The mailbox is already in the list."
 msgstr ""
 
-#: src/mn-mailbox.gob:130
+#: src/mn-mailbox.gob:131
 msgid "The mailbox URI"
 msgstr ""
 
-#: src/mn-mailbox.gob:141
+#: src/mn-mailbox.gob:142
 msgid "The mailbox human-readable name"
 msgstr ""
 
-#: src/mn-mailbox.gob:145
+#: src/mn-mailbox.gob:146
 msgid "Whether the mailbox has to be polled or not"
 msgstr ""
 
-#: src/mn-mailbox.gob:151
-msgid "Whether the mailbox has new mail or not"
-msgstr ""
-
-#: src/mn-mailbox.gob:156
+#: src/mn-mailbox.gob:152
 msgid "The list of new and unread MNMessage objects"
 msgstr ""
 
-#: src/mn-mailbox.gob:210
+#: src/mn-mailbox.gob:206
 msgid "The mailbox error, if any"
 msgstr ""
 
-#: src/mn-mailbox.gob:309
+#: src/mn-mailbox.gob:305
 msgid "does not exist"
 msgstr ""
 
-#: src/mn-mailbox.gob:341
+#: src/mn-mailbox.gob:337
 msgid "unknown format"
 msgstr ""
 
-#: src/mn-mailbox.gob:407
+#: src/mn-mailbox.gob:403
 #, c-format
-msgid "unable to enable immediate notification for %s: %s"
+msgid "unable to enable immediate notification: %s"
 msgstr ""
 
-#: src/mn-mailbox.gob:425
+#: src/mn-mailbox.gob:421
 #, c-format
 msgid ""
 "As a fallback, they will be checked every %i second (this delay is "
@@ -948,7 +1018,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-mailbox.gob:436
+#: src/mn-mailbox.gob:432
 #, c-format
 msgid ""
 "As a fallback, they will be checked every %i minute (this delay is "
@@ -959,7 +1029,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-mailbox.gob:447
+#: src/mn-mailbox.gob:443
 #, c-format
 msgid ""
 "As a fallback, they will be checked approximately every %i minute (this "
@@ -970,216 +1040,377 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-mailbox.gob:463
+#: src/mn-mailbox.gob:459
 msgid "A monitoring error has occurred"
 msgstr ""
 
-#: src/mn-mailbox.gob:464
+#: src/mn-mailbox.gob:460
 #, c-format
 msgid ""
 "Mail Notification was unable to enable immediate notification for one or "
 "more mailboxes. %s"
 msgstr ""
 
-#: src/mn-mailboxes.gob:142
+#: src/mn-mailboxes.gob:130
 msgid "Whether one or more of the mailboxes has to be polled"
 msgstr ""
 
-#: src/mn-mailboxes.gob:272
+#: src/mn-mailboxes.gob:260
 #, c-format
 msgid "%s is unsupported: %s"
 msgstr ""
 
-#: src/mn-mailboxes.gob:304
-#, c-format
-msgid "%s has new mail"
-msgstr ""
-
-#: src/mn-mailboxes.gob:304
+#: src/mn-mailboxes.gob:290
 #, c-format
-msgid "%s has no new mail"
-msgstr ""
+msgid "%s has %i new message"
+msgid_plural "%s has %i new messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/mn-mailboxes.gob:330
+#: src/mn-mailboxes.gob:307
 #, c-format
 msgid "%s reported an error: %s"
 msgstr ""
 
-#: src/mn-maildir-mailbox.gob:119
+#: src/mn-maildir-mailbox.gob:112
 #, c-format
 msgid "unable to open folder \"new\": %s"
 msgstr ""
 
-#: src/mn-maildir-mailbox.gob:161
+#: src/mn-maildir-mailbox.gob:141
 #, c-format
 msgid "unable to close folder \"new\": %s"
 msgstr ""
 
-#: src/mn-maildir-mailbox.gob:164
+#: src/mn-maildir-mailbox.gob:144
 #, c-format
 msgid "error while reading folder \"new\": %s"
 msgstr ""
 
+#. Toplevel
+#: src/mn-main-window.c:92
+msgid "_Mail"
+msgstr ""
+
+#: src/mn-main-window.c:93
+msgid "_Edit"
+msgstr ""
+
+#: src/mn-main-window.c:94
+msgid "_View"
+msgstr ""
+
+#: src/mn-main-window.c:95
+msgid "_Help"
+msgstr ""
+
+#: src/mn-main-window.c:103
+msgid "Launch the mail reader"
+msgstr ""
+
+#. Reload
+#: src/mn-main-window.c:111 src/mn-main.c:230
+msgid "Update the mail status"
+msgstr ""
+
+#: src/mn-main-window.c:117
+msgid "_Close"
+msgstr ""
+
+#: src/mn-main-window.c:119
+msgid "Close this window"
+msgstr ""
+
+#: src/mn-main-window.c:125
+msgid "_Quit"
+msgstr ""
+
+#: src/mn-main-window.c:127 src/mn-main.c:257
+#, fuzzy
+msgid "Quit Mail Notification"
+msgstr "Иконка входящих сообщений"
+
+#: src/mn-main-window.c:135 src/mn-main-window.c:183
+msgid "_Toolbars"
+msgstr ""
+
+#: src/mn-main-window.c:137
+msgid "Customize the toolbars"
+msgstr ""
+
+#: src/mn-main-window.c:143
+msgid "_Preferences"
+msgstr ""
+
+#: src/mn-main-window.c:153
+msgid "Toolbars Styl_e"
+msgstr ""
+
+#: src/mn-main-window.c:155
+msgid "Customize the toolbars style"
+msgstr ""
+
+#: src/mn-main-window.c:163
+msgid "_Contents"
+msgstr ""
+
+#: src/mn-main-window.c:165
+msgid "Display help"
+msgstr ""
+
+#: src/mn-main-window.c:171
+msgid "_About"
+msgstr ""
+
+#: src/mn-main-window.c:173
+msgid "Display credits"
+msgstr ""
+
+#: src/mn-main-window.c:185
+msgid "Show or hide the toolbars"
+msgstr ""
+
+#: src/mn-main-window.c:192
+msgid "_Statusbar"
+msgstr ""
+
+#: src/mn-main-window.c:194
+msgid "Show or hide the statusbar"
+msgstr ""
+
+#: src/mn-main-window.c:205
+msgid "_Desktop Default"
+msgstr ""
+
+#: src/mn-main-window.c:207
+msgid "Set the toolbars style to the desktop default setting"
+msgstr ""
+
+#: src/mn-main-window.c:213
+msgid "I_cons Only"
+msgstr ""
+
+#: src/mn-main-window.c:215
+msgid "Only display the toolbars icons"
+msgstr ""
+
+#: src/mn-main-window.c:221
+msgid "_Text Only"
+msgstr ""
+
+#: src/mn-main-window.c:223
+msgid "Only display the toolbars text"
+msgstr ""
+
+#: src/mn-main-window.c:229
+msgid "Text Belo_w Icons"
+msgstr ""
+
+#: src/mn-main-window.c:231
+msgid "Display the toolbars text below the icons"
+msgstr ""
+
+#: src/mn-main-window.c:237
+msgid "Text Be_side Icons"
+msgstr ""
+
+#: src/mn-main-window.c:239
+msgid "Display the toolbars text beside the icons"
+msgstr ""
+
+#: src/mn-main-window.c:363
+#, c-format
+msgid "unable to load menus.xml: %s"
+msgstr ""
+
+#: src/mn-main-window.c:398
+msgid "Help messages"
+msgstr ""
+
+#: src/mn-main-window.c:399
+msgid "Count messages"
+msgstr ""
+
+#: src/mn-main-window.c:503
+#, c-format
+msgid "%i new message"
+msgid_plural "%i new messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/mn-main-window.c:540
+msgid "unable to load toolbars.xml"
+msgstr ""
+
 #: src/mn-main.c:99
 #, c-format
 msgid "Compiled-in mailbox backends: %s\n"
 msgstr ""
 
+#: src/mn-main.c:113
+msgid "Gmail timestamps"
+msgstr ""
+
 #: src/mn-main.c:116
 #, c-format
 msgid "Compiled-in features: %s\n"
 msgstr ""
 
-#: src/mn-main.c:175
+#: src/mn-main.c:176
 msgid "Enable informational output"
 msgstr ""
 
-#: src/mn-main.c:184
-msgid "List compiled-in features and exit"
+#: src/mn-main.c:185
+msgid "List the compiled-in features"
 msgstr ""
 
-#: src/mn-main.c:193
-msgid "Display the mail summary dialog"
+#: src/mn-main.c:194
+msgid "Display the main window"
 msgstr ""
 
-#: src/mn-main.c:202
+#: src/mn-main.c:203
 msgid "Display the properties dialog"
 msgstr ""
 
-#: src/mn-main.c:211
+#: src/mn-main.c:212
 msgid "Display the about dialog"
 msgstr ""
 
-#: src/mn-main.c:220
+#: src/mn-main.c:221
 msgid "Close the mail summary popup"
 msgstr ""
 
-#: src/mn-main.c:229
-msgid "Update the mail status"
-msgstr ""
-
-#: src/mn-main.c:238
+#: src/mn-main.c:239
 msgid "Report the mail status"
 msgstr ""
 
-#: src/mn-main.c:247
-msgid "Unset obsolete GConf configuration and exit"
+#: src/mn-main.c:248
+msgid "Unset obsolete GConf configuration"
 msgstr ""
 
 #.
 #. * We can't use mn_error_dialog() because gtk_init() has not been
 #. * called yet.
 #.
-#: src/mn-main.c:273
+#: src/mn-main.c:284
 msgid "multi-threading is not available"
 msgstr ""
 
-#: src/mn-main.c:320
+#: src/mn-main.c:338
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
 msgstr ""
 
-#: src/mn-main.c:325
+#: src/mn-main.c:344
+#, fuzzy
+msgid "quitting Mail Notification"
+msgstr "Иконка входящих сообщений"
+
+#: src/mn-main.c:348
+#, fuzzy
+msgid "Mail Notification is not running"
+msgstr "Иконка входящих сообщений"
+
+#: src/mn-main.c:355
 msgid "Unable to initialize the GnomeVFS library."
 msgstr ""
 
-#: src/mn-main.c:361
+#: src/mn-main.c:391
 msgid "updating the mail status"
 msgstr ""
 
-#: src/mn-main.c:379
+#: src/mn-main.c:409
 #, fuzzy
 msgid "Mail Notification is already running"
 msgstr "Иконка входящих сообщений"
 
-#: src/mn-main.c:386
+#: src/mn-main.c:417
 msgid ""
 "Bonobo could not locate the GNOME_MailNotification_Automation.server file. "
 "Please check your Mail Notification installation."
 msgstr ""
 
-#: src/mn-main.c:390
+#: src/mn-main.c:421
 msgid ""
 "Bonobo was unable to register the automation server. Please check your Mail "
 "Notification installation."
 msgstr ""
 
-#: src/mn-mbox-mailbox.gob:221
+#: src/mn-mbox-mailbox.gob:184
 #, c-format
-msgid "error while reading mailbox: %s"
+msgid "unable to open mailbox: %s"
 msgstr ""
 
-#: src/mn-mbox-mailbox.gob:230
-#, c-format
-msgid "unable to open mailbox: %s"
+#: src/mn-message-mime.c:105
+msgid "unable to parse MIME message"
 msgstr ""
 
-#: src/mn-message-box.gob:64
+#: src/mn-message-view.gob:81
+msgid "You have no new mail."
+msgstr ""
+
+#: src/mn-message-view.gob:321
 msgid "Unreadable message"
 msgstr ""
 
-#: src/mn-message-box.gob:69
+#: src/mn-message-view.gob:329
 msgid "From"
 msgstr ""
 
-#: src/mn-message-box.gob:70
+#: src/mn-message-view.gob:337
 msgid "Subject"
 msgstr ""
 
-#: src/mn-message-box.gob:75
+#: src/mn-message-view.gob:348
 msgid "Sent"
 msgstr ""
 
-#: src/mn-message-box.gob:192
+#: src/mn-message.gob:101
+msgid "Unknown"
+msgstr ""
+
+#: src/mn-message.gob:126
 #, c-format
 msgid "%i second ago"
 msgid_plural "%i seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-box.gob:196
+#: src/mn-message.gob:130
 #, c-format
-msgid "%i minute ago"
-msgid_plural "%i minutes ago"
+msgid "about %i minute ago"
+msgid_plural "about %i minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-box.gob:201
+#: src/mn-message.gob:135
 #, c-format
-msgid "%i hour ago"
-msgid_plural "%i hours ago"
+msgid "about %i hour ago"
+msgid_plural "about %i hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-box.gob:206
+#: src/mn-message.gob:140
 #, c-format
-msgid "%i day ago"
-msgid_plural "%i days ago"
+msgid "about %i day ago"
+msgid_plural "about %i days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-box.gob:211
+#: src/mn-message.gob:145
 #, c-format
-msgid "%i week ago"
-msgid_plural "%i weeks ago"
+msgid "about %i week ago"
+msgid_plural "about %i weeks ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-message-mime.c:105
-msgid "unable to parse MIME message"
-msgstr ""
-
-#: src/mn-message.gob:101
-msgid "Unknown"
-msgstr ""
-
-#: src/mn-mh-mailbox.gob:184
+#: src/mn-mh-mailbox.gob:147
 #, c-format
 msgid "error while reading .mh_sequences: %s"
 msgstr ""
 
-#: src/mn-mh-mailbox.gob:196
+#: src/mn-mh-mailbox.gob:157
 #, c-format
 msgid "unable to open .mh_sequences: %s"
 msgstr ""
@@ -1188,23 +1419,23 @@ msgstr ""
 msgid "detecting"
 msgstr ""
 
-#: src/mn-pi-mailbox-properties.gob:76
+#: src/mn-pi-mailbox-properties.gob:75
 msgid "_Hostname:"
 msgstr ""
 
-#: src/mn-pi-mailbox-properties.gob:94
+#: src/mn-pi-mailbox-properties.gob:93
 msgid "_Details"
 msgstr ""
 
-#: src/mn-pi-mailbox-properties.gob:106
+#: src/mn-pi-mailbox-properties.gob:105
 msgid "sta_ndard"
 msgstr ""
 
-#: src/mn-pi-mailbox-properties.gob:116
+#: src/mn-pi-mailbox-properties.gob:115
 msgid "_in-band SSL/TLS"
 msgstr ""
 
-#: src/mn-pi-mailbox-properties.gob:126
+#: src/mn-pi-mailbox-properties.gob:125
 msgid "SSL/TLS on sepa_rate port"
 msgstr ""
 
@@ -1226,77 +1457,77 @@ msgstr ""
 msgid "The port number of the POP3 server"
 msgstr ""
 
-#: src/mn-pop3-mailbox.gob:273
+#: src/mn-pop3-mailbox.gob:266
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr ""
 
-#: src/mn-pop3-mailbox.gob:590
+#: src/mn-pop3-mailbox.gob:569
 msgid "unknown error"
 msgstr ""
 
-#: src/mn-pop3-mailbox.gob:729
+#: src/mn-pop3-mailbox.gob:656
 #, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
 msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-pop3-mailbox.gob:893
+#: src/mn-pop3-mailbox.gob:849
 msgid "server does not support APOP authentication"
 msgstr ""
 
-#: src/mn-pop3-mailbox.gob:922
+#: src/mn-pop3-mailbox.gob:884
 msgid "falling back to APOP authentication"
 msgstr ""
 
-#: src/mn-pop3-mailbox.gob:927
+#: src/mn-pop3-mailbox.gob:889
 msgid "falling back to USER/PASS authentication"
 msgstr ""
 
-#: src/mn-properties.c:193
+#: src/mn-properties-dialog.c:218
 msgid "top left"
 msgstr ""
 
-#: src/mn-properties.c:194
+#: src/mn-properties-dialog.c:219
 msgid "top right"
 msgstr ""
 
-#: src/mn-properties.c:195
+#: src/mn-properties-dialog.c:220
 msgid "bottom left"
 msgstr ""
 
-#: src/mn-properties.c:196
+#: src/mn-properties-dialog.c:221
 msgid "bottom right"
 msgstr ""
 
-#: src/mn-properties.c:287
+#: src/mn-properties-dialog.c:323
 msgid "No mailbox selected."
 msgstr ""
 
-#: src/mn-properties.c:292
+#: src/mn-properties-dialog.c:328
 #, c-format
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mn-shell.gob:93
+#: src/mn-shell.gob:96
 msgid "You have new mail."
 msgstr ""
 
-#: src/mn-shell.gob:360
+#: src/mn-shell.gob:361
 msgid "Mailboxes Having New Mail"
 msgstr ""
 
-#: src/mn-shell.gob:362
+#: src/mn-shell.gob:382
 msgid "Errors"
 msgstr ""
 
-#: src/mn-shell.gob:364
+#: src/mn-shell.gob:403
 msgid "Unsupported Mailboxes"
 msgstr ""
 
-#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:418
 msgid "Mail Summary"
 msgstr ""
 
@@ -1314,20 +1545,20 @@ msgid "Select _All"
 msgstr ""
 
 #: src/mn-stock.c:29
-msgid "_Mail Summary"
+msgid "Leave Fullscreen"
 msgstr ""
 
-#: src/mn-sylpheed-mailbox.gob:119
+#: src/mn-sylpheed-mailbox.gob:113
 #, c-format
 msgid "unable to open folder: %s"
 msgstr ""
 
-#: src/mn-sylpheed-mailbox.gob:165
+#: src/mn-sylpheed-mailbox.gob:147
 #, c-format
 msgid "unable to close folder: %s"
 msgstr ""
 
-#: src/mn-sylpheed-mailbox.gob:168
+#: src/mn-sylpheed-mailbox.gob:150
 #, c-format
 msgid "error while reading folder: %s"
 msgstr ""
@@ -1355,66 +1586,74 @@ msgstr ""
 msgid "unsupported"
 msgstr ""
 
-#: src/mn-util.c:233
+#: src/mn-util.c:245
 #, c-format
 msgid "error loading image: %s"
 msgstr ""
 
-#: src/mn-util.c:271
+#: src/mn-util.c:276
 #, c-format
 msgid "widget \"%s\" not found in interface \"%s\""
 msgstr ""
 
-#: src/mn-util.c:385
+#: src/mn-util.c:390
 msgid "received an invalid URI list"
 msgstr ""
 
-#: src/mn-util.c:421
+#: src/mn-util.c:426
 msgid "received an invalid Mozilla URL"
 msgstr ""
 
-#: src/mn-util.c:514
+#: src/mn-util.c:519
 msgid "Unable to display help"
 msgstr ""
 
-#: src/mn-util.c:528
+#: src/mn-util.c:533
 #, c-format
 msgid "Unable to create a thread: %s."
 msgstr ""
 
-#: src/mn-util.c:705
+#: src/mn-util.c:626
 msgid "_Do not show this message again"
 msgstr ""
 
-#: src/mn-util.c:789
+#: src/mn-util.c:710
 msgid "A fatal error has occurred in Mail Notification"
 msgstr ""
 
-#: src/mn-util.c:804
+#: src/mn-util.c:725
 #, c-format
 msgid "unable to get current time: %s"
 msgstr ""
 
-#: src/mn-util.c:906
+#: src/mn-util.c:787
 #, c-format
 msgid "invalid signal specification \"%s\""
 msgstr ""
 
-#: src/mn-util.c:945
+#: src/mn-util.c:826
 msgid "A command error has occurred in Mail Notification"
 msgstr ""
 
-#: src/mn-util.c:946
+#: src/mn-util.c:827
 #, c-format
 msgid "Unable to execute \"%s\": %s."
 msgstr ""
 
 #: ui/authentication.glade.h:1
-msgid "*"
+msgid "_Authenticate"
 msgstr ""
 
-#: ui/authentication.glade.h:2
-msgid "_Authenticate"
+#: ui/edit-toolbars.glade.h:1
+msgid "Edit Toolbars"
+msgstr ""
+
+#: ui/edit-toolbars.glade.h:2
+msgid "_Add a New Toolbar"
+msgstr ""
+
+#: ui/edit-toolbars.glade.h:3
+msgid "_Use Default"
 msgstr ""
 
 #: ui/mailbox-properties.glade.h:1
@@ -1422,31 +1661,31 @@ msgid "_Mailbox type:"
 msgstr ""
 
 #: ui/properties.glade.h:1
-msgid "    "
+msgid "<span weight=\"bold\">Commands</span>"
 msgstr ""
 
 #: ui/properties.glade.h:2
-msgid "<span weight=\"bold\">Commands</span>"
+msgid "<span weight=\"bold\">Double-click Action</span>"
 msgstr ""
 
 #: ui/properties.glade.h:3
-msgid "<span weight=\"bold\">Double-click Action</span>"
+msgid "<span weight=\"bold\">Fonts</span>"
 msgstr ""
 
 #: ui/properties.glade.h:4
-msgid "<span weight=\"bold\">Fonts</span>"
+msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
 #: ui/properties.glade.h:5
-msgid "<span weight=\"bold\">General</span>"
+msgid "<span weight=\"bold\">Mailbox List</span>"
 msgstr ""
 
 #: ui/properties.glade.h:6
-msgid "<span weight=\"bold\">Mailbox List</span>"
+msgid "<span weight=\"bold\">Position</span>"
 msgstr ""
 
 #: ui/properties.glade.h:7
-msgid "<span weight=\"bold\">Position</span>"
+msgid "Co_ntents:"
 msgstr ""
 
 #: ui/properties.glade.h:8
@@ -1519,111 +1758,104 @@ msgid ""
 msgstr ""
 
 #: ui/properties.glade.h:23
-msgid "When _all mail is read:"
+msgid "Use these _fonts:"
 msgstr ""
 
 #: ui/properties.glade.h:24
-msgid "When _new mail arrives:"
+msgid "When _all mail is read:"
 msgstr ""
 
 #: ui/properties.glade.h:25
-msgid "Whether the status icon should blink on errors or not"
+msgid "When _new mail arrives:"
 msgstr ""
 
 #: ui/properties.glade.h:26
-msgid "Whether to automatically close the mail summary popup or not"
+msgid "Whether the status icon should blink on errors or not"
 msgstr ""
 
 #: ui/properties.glade.h:27
-msgid "Whether to display the mail summary in the status icon tooltip or not"
+msgid "Whether to automatically close the mail summary popup or not"
 msgstr ""
 
 #: ui/properties.glade.h:28
+msgid "Whether to display the mail summary in the status icon tooltip or not"
+msgstr ""
+
+#: ui/properties.glade.h:29
 #, fuzzy
 msgid "Whether to display the mail summary popup when new mail arrives or not"
 msgstr ""
 "Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: ui/properties.glade.h:29
+#: ui/properties.glade.h:30
 msgid "Whether to hide previously displayed mail or not"
 msgstr ""
 
-#: ui/properties.glade.h:30
+#: ui/properties.glade.h:31
 #, fuzzy
 msgid "Whether to run a command when all mail is read or not"
 msgstr ""
 "Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: ui/properties.glade.h:31
+#: ui/properties.glade.h:32
 msgid "Whether to run a command when new mail arrives or not"
 msgstr ""
 
-#: ui/properties.glade.h:32
+#: ui/properties.glade.h:33
 #, fuzzy
 msgid "Whether to set a mail reader or not"
 msgstr ""
 "Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
-#: ui/properties.glade.h:33
-msgid ""
-"Whether to start Mail Notification when you log into your GNOME session or "
-"not"
-msgstr ""
-
 #: ui/properties.glade.h:34
-#, fuzzy
 msgid ""
-"Whether to use a custom font for the contents of the mail summary popup or "
+"Whether to start Mail Notification when you log into your GNOME session or "
 "not"
 msgstr ""
-"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
 #: ui/properties.glade.h:35
-#, fuzzy
-msgid ""
-"Whether to use a custom font for the title of the mail summary popup or not"
+msgid "_Automatically close after:"
 msgstr ""
-"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
 
 #: ui/properties.glade.h:36
-msgid "_Automatically close after:"
+msgid "_Blink on errors"
 msgstr ""
 
 #: ui/properties.glade.h:37
-msgid "_Blink on errors"
+msgid "_Delay between mail checks:"
 msgstr ""
 
 #: ui/properties.glade.h:38
-msgid "_Contents font:"
+msgid "_Display the main window"
 msgstr ""
 
 #: ui/properties.glade.h:39
-msgid "_Delay between mail checks:"
+msgid "_Enable mail summary popup"
 msgstr ""
 
 #: ui/properties.glade.h:40
-msgid "_Display the mail summary dialog"
+msgid "_Launch the mail reader"
 msgstr ""
 
 #: ui/properties.glade.h:41
-msgid "_Enable mail summary popup"
+msgid "_Mail reader:"
 msgstr ""
 
 #: ui/properties.glade.h:42
-msgid "_Launch the mail reader"
-msgstr ""
+#, fuzzy
+msgid "_Start Mail Notification on GNOME login"
+msgstr "Иконка входящих сообщений"
 
 #: ui/properties.glade.h:43
-msgid "_Mail reader:"
+msgid "_Title:"
 msgstr ""
 
 #: ui/properties.glade.h:44
-#, fuzzy
-msgid "_Start Mail Notification on GNOME login"
-msgstr "Иконка входящих сообщений"
+msgid "_Update the mail status"
+msgstr ""
 
 #: ui/properties.glade.h:45
-msgid "_Title font:"
+msgid "_Use fonts from theme"
 msgstr ""
 
 #: ui/properties.glade.h:46
@@ -1652,7 +1884,7 @@ msgid ""
 "\n"
 "Mail Notification has been loaded successfully.\n"
 "\n"
-"Since this is the first time you run Mail Notification, you might want to "
+"Since this is the first time you run Mail Notification, you need to "
 "configure it.\n"
 "\n"
 "Note: this message will not be shown anymore. To configure Mail Notification "
diff --git a/po/sr.gmo b/po/sr.gmo
Binary files differ.
diff --git a/po/sr.po b/po/sr.po
@@ -1,20 +1,20 @@
 # Serbian translations for mail-notification.
-# Copyright (c) 2003, 2004 Jean-Yves Lefort.
+# Copyright (C) 2003-2005 Jean-Yves Lefort.
 #
 # This file is distributed under the same license as the
 # mail-notification package.
 #
-# Filip Miletic <filmil@gmail.com>, 2004.
+# Filip Miletic <filmil@gmail.com>, 2004, 2005.
 #
 # Both Serbian Cyrillic and Serbian Latin files should
 # be available.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 1.0\n"
+"Project-Id-Version: mail-notification 1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-25 01:43+0100\n"
-"PO-Revision-Date: 2004-11-21 19:32:+0100\n"
+"POT-Creation-Date: 2005-03-02 02:32+0100\n"
+"PO-Revision-Date: 2005-03-01 02:17+0100\n"
 "Last-Translator: Филип Милетић <filmil@gmail.com>\n"
 "Language-Team: Serbian (sr) <gnu@prevod.org>\n"
 "MIME-Version: 1.0\n"
@@ -31,14 +31,14 @@ msgstr "Дојава приспећа поште"
 msgid "Mail Notification automation factory"
 msgstr "Фабрика ѕа дојаву приспећа поште"
 
-#: data/mail-notification-properties.desktop.in.h:1
+#: data/mail-notification-properties.desktop.in.h:1 src/mn-main-window.c:145
 msgid "Configure Mail Notification"
 msgstr "Подеси дојаву приспећа поште"
 
 #: data/mail-notification-properties.desktop.in.h:2
 #: data/mail-notification.desktop.in.h:2
-#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:40
-#: src/mn-mail-icon.gob:194 src/mn-main.c:281
+#: data/mail-notification.soundlist.in.h:1 src/mn-about-dialog.gob:39
+#: src/mn-mail-icon.gob:224 src/mn-main.c:292 ui/main.glade.h:1
 msgid "Mail Notification"
 msgstr "Дојава поште"
 
@@ -87,149 +87,168 @@ msgid "Has already been run"
 msgstr "Већ је покренут"
 
 #: data/mail-notification.schemas.in.h:11
-msgid "Height of mail summary dialog"
-msgstr "Висина прозора са сажетком порука"
+msgid "Height of edit toolbars dialog"
+msgstr "Висина прозора за уређивање алатних трака"
 
 #: data/mail-notification.schemas.in.h:12
+msgid "Height of main window"
+msgstr "Висина главног прозора"
+
+#: data/mail-notification.schemas.in.h:13
 msgid "Height of properties dialog"
 msgstr "Висина прозора са поставкама"
 
-#: data/mail-notification.schemas.in.h:13
+#: data/mail-notification.schemas.in.h:14
 msgid "Mail read command"
 msgstr "Команда за читање поште"
 
-#: data/mail-notification.schemas.in.h:14
+#: data/mail-notification.schemas.in.h:15
 msgid "Mail reader command"
 msgstr "Команда за читање поште"
 
-#: data/mail-notification.schemas.in.h:15
+#: data/mail-notification.schemas.in.h:16
 msgid "Mail summary popup contents font"
 msgstr "Писмо које се користи за садржај прозора са сажетком порука"
 
-#: data/mail-notification.schemas.in.h:16
+#: data/mail-notification.schemas.in.h:17
+msgid "Mail summary popup fonts aspect source"
+msgstr "Извор за аспект за писмо у прозору за сажетак (???)"
+
+#: data/mail-notification.schemas.in.h:18
 msgid "Mail summary popup horizontal offset"
 msgstr "Померај хоризонталних тачака за прозор са сажетком порука"
 
-#: data/mail-notification.schemas.in.h:17
+#: data/mail-notification.schemas.in.h:19
 msgid "Mail summary popup position"
 msgstr "Број хоризонталних тачака за прозор са сажетком порука"
 
-#: data/mail-notification.schemas.in.h:18
+#: data/mail-notification.schemas.in.h:20
 msgid "Mail summary popup title font"
 msgstr "Писмо које се користи за наслов прозора са сажетком порука"
 
-#: data/mail-notification.schemas.in.h:19
+#: data/mail-notification.schemas.in.h:21
 msgid "Mail summary popup vertical offset"
 msgstr "Померај вертикалних тачака ѕа прозор са сажетком порука"
 
-#: data/mail-notification.schemas.in.h:20
+#: