diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03ea1f2a..5dda9a96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,8 @@ set(ARCHIVE_BASE_NAME ${CMAKE_PROJECT_NAME}-${VERSION})
 set(ARCHIVE_FULL_NAME ${ARCHIVE_BASE_NAME}.tar.xz)
 set(ARCHIVE_DEBUILD_FULL_NAME ${CMAKE_PROJECT_NAME}_${VERSION}.orig.tar.xz)
 
+set(GLADE_FILES ui/composer.glade ui/login.glade ui/message.glade ui/password-dialog.glade ui/toolbar.glade)
+
 option(ICON_UPDATE "Run gtk-update-icon-cache after the install." ON)
 option(DESKTOP_UPDATE "Run update-desktop-database after the install." ON)
 
diff --git a/cmake/Gettext.cmake b/cmake/Gettext.cmake
index 08a52a7d..0cfa7063 100644
--- a/cmake/Gettext.cmake
+++ b/cmake/Gettext.cmake
@@ -48,20 +48,21 @@
 
 FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge)
 FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
+FIND_PROGRAM(GETTEXT_MSGCAT_EXECUTABLE msgcat)
 FIND_PROGRAM(XGETTEXT_EXECUTABLE xgettext)
 
 SET(XGETTEXT_OPTIONS_DEFAULT
     --language=C --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 -s
     --escape --add-comments="/" --package-name=${PROJECT_NAME} --package-version=${VERSION})
 
-IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
+IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND GETTEXT_MSGCAT_EXECUTABLE)
     SET(GETTEXT_FOUND TRUE)
 ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE)
     SET(GETTEXT_FOUND FALSE)
     IF (GetText_REQUIRED)
 	MESSAGE(FATAL_ERROR "GetText not found")
     ENDIF (GetText_REQUIRED)
-ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
+ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND GETTEXT_MSGCAT_EXECUTABLE)
 
 IF(XGETTEXT_EXECUTABLE)
     SET(XGETTEXT_FOUND TRUE)
@@ -79,22 +80,31 @@ IF(XGETTEXT_FOUND)
 	SET(_xgettext_options_list)
 	SET(_src_list)
 	SET(_src_list_abs)
+	SET(_glade_list)
+	SET(_glade_list_abs)
 	SET(_stage "SRC")
 	FOREACH(_pot_option ${_pot_options} ${ARGN})
-	    IF(_pot_option STREQUAL "OPTION")
-		SET(_stage "OPTION")
-	    ELSEIF(_pot_option STREQUAL "SRC")
-		SET(_stage "SRC")
-	    ELSE(_pot_option STREQUAL "OPTION")
-		IF(_stage STREQUAL "OPTION")
-		    SET(_xgettext_options_list ${_xgettext_options_list} ${_pot_option})
-		ELSE(_stage STREQUAL "OPTION")
-		    FILE(RELATIVE_PATH _relFile ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${_pot_option})
-		    GET_FILENAME_COMPONENT(_absFile ${_pot_option} ABSOLUTE)
-		    SET(_src_list ${_src_list} ${_relFile})
-		    SET(_src_list_abs ${_src_list_abs} ${_absFile})
-		ENDIF(_stage STREQUAL "OPTION")
-	    ENDIF(_pot_option STREQUAL "OPTION")
+		IF(_pot_option STREQUAL "OPTION")
+			SET(_stage "OPTION")
+		ELSEIF(_pot_option STREQUAL "SRC")
+			SET(_stage "SRC")
+		ELSEIF(_pot_option STREQUAL "GLADE")
+			SET(_stage "GLADE")
+		ELSE(_pot_option STREQUAL "OPTION")
+			IF(_stage STREQUAL "OPTION")
+				SET(_xgettext_options_list ${_xgettext_options_list} ${_pot_option})
+			ELSEIF(_stage STREQUAL "GLADE")
+				FILE(RELATIVE_PATH _relFile ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/${_pot_option})
+				GET_FILENAME_COMPONENT(_absFile ${_pot_option} ABSOLUTE)
+				SET(_glade_list ${_glade_list} ${_relFile})
+				SET(_glade_list_abs ${_glade_list_abs} ${_absFile})
+			ELSEIF(_stage STREQUAL "SRC")
+				FILE(RELATIVE_PATH _relFile ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${_pot_option})
+				GET_FILENAME_COMPONENT(_absFile ${_pot_option} ABSOLUTE)
+				SET(_src_list ${_src_list} ${_relFile})
+				SET(_src_list_abs ${_src_list_abs} ${_absFile})
+			ENDIF(_stage STREQUAL "OPTION")
+		ENDIF(_pot_option STREQUAL "OPTION")
 	ENDFOREACH(_pot_option ${_pot_options} ${ARGN})
 
 	IF (_xgettext_options_list)
@@ -106,12 +116,14 @@ IF(XGETTEXT_FOUND)
 	#MESSAGE("${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o ${_potFile} ${_src_list}")
 	ADD_CUSTOM_COMMAND(OUTPUT pot_file
 	    COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options} -o ${_potFile} ${_src_list}
-	    DEPENDS ${_src_list_abs}
+	    DEPENDS ${_src_list_abs} ${GLADE_FILES}
 	    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 	    )
 
 	ADD_CUSTOM_TARGET(pot_file
-	    COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o ${_potFile} ${_src_list}
+	    COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o _source.pot ${_src_list}
+	    COMMAND ${XGETTEXT_EXECUTABLE} --language=Glade --omit-header -o _glade.pot ${_glade_list}
+	    COMMAND ${GETTEXT_MSGCAT_EXECUTABLE} -o ${_potFile} --use-first _source.pot _glade.pot
 	    DEPENDS ${_src_list_abs}
 	    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 	    COMMENT "Extract translatable messages to ${_potFile}"
diff --git a/desktop/geary.desktop b/desktop/geary.desktop
index 1558c374..5bf15210 100644
--- a/desktop/geary.desktop
+++ b/desktop/geary.desktop
@@ -1,3 +1,4 @@
+# See src/client/geary-application.vala for corresponding strings in the application
 [Desktop Entry]
 Icon=geary
 Name=Geary
diff --git a/po/geary.pot b/po/geary.pot
index c38ecbb9..5b9b16af 100644
--- a/po/geary.pot
+++ b/po/geary.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.1.0+trunk\n"
 "Report-Msgid-Bugs-To: Jim Nelson <jim@yorba.org>\n"
-"POT-Creation-Date: 2012-08-29 15:22-0700\n"
+"POT-Creation-Date: 2012-08-29 18:30-0700\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"
@@ -152,7 +152,7 @@ msgstr ""
 msgid "Date: %s\n"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:101
+#: ../../src/client/geary-application.vala:107
 msgid "Display program version"
 msgstr ""
 
@@ -164,7 +164,7 @@ msgstr ""
 msgid "Drafts"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:16
+#: ../../src/client/geary-application.vala:25
 msgid "Email Client"
 msgstr ""
 
@@ -172,7 +172,7 @@ msgstr ""
 msgid "Failed to open default text editor."
 msgstr ""
 
-#: ../../src/client/geary-application.vala:114
+#: ../../src/client/geary-application.vala:120
 #, c-format
 msgid "Failed to parse command line options: %s\n"
 msgstr ""
@@ -195,6 +195,10 @@ msgctxt "Abbreviation for gigabyte"
 msgid "GB"
 msgstr ""
 
+#: ../../src/client/geary-application.vala:24
+msgid "Geary"
+msgstr ""
+
 #: ../../src/engine/api/geary-service-provider.vala:35
 msgid "Gmail"
 msgstr ""
@@ -220,31 +224,31 @@ msgstr ""
 msgid "Large"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:96
+#: ../../src/client/geary-application.vala:102
 msgid "Log IMAP replay queue"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:94
+#: ../../src/client/geary-application.vala:100
 msgid "Log conversation monitoring"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:99
+#: ../../src/client/geary-application.vala:105
 msgid "Log database queries (generates lots of messages)"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:100
+#: ../../src/client/geary-application.vala:106
 msgid "Log folder normalization"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:95
+#: ../../src/client/geary-application.vala:101
 msgid "Log network activity"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:97
+#: ../../src/client/geary-application.vala:103
 msgid "Log network serialization"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:98
+#: ../../src/client/geary-application.vala:104
 msgid "Log periodic activity"
 msgstr ""
 
@@ -311,7 +315,7 @@ msgstr ""
 msgid "Outbox"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:93
+#: ../../src/client/geary-application.vala:99
 msgid "Output debugging information"
 msgstr ""
 
@@ -319,7 +323,7 @@ msgstr ""
 msgid "Please enter your email password"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:122
+#: ../../src/client/geary-application.vala:128
 msgid "Please report comments, suggestions and bugs to:"
 msgstr ""
 
@@ -345,6 +349,10 @@ msgstr ""
 msgid "Select _All"
 msgstr ""
 
+#: ../../src/client/geary-application.vala:26
+msgid "Send and receive email"
+msgstr ""
+
 #: ../../src/engine/api/geary-special-folder-type.vala:27
 msgid "Sent Mail"
 msgstr ""
@@ -528,3 +536,280 @@ msgstr ""
 #: ../../src/client/geary-controller.vala:732
 msgid "translator-credits"
 msgstr ""
+
+#: ../../ui/composer.glade:37
+msgid "_Left"
+msgstr ""
+
+#: ../../ui/composer.glade:43
+msgid "_Right"
+msgstr ""
+
+#: ../../ui/composer.glade:49
+msgid "_Center"
+msgstr ""
+
+#: ../../ui/composer.glade:55
+msgid "_Justify"
+msgstr ""
+
+#: ../../ui/composer.glade:61
+msgid "Lin_k"
+msgstr ""
+
+#: ../../ui/composer.glade:68
+msgid "C_olor"
+msgstr ""
+
+#: ../../ui/composer.glade:75
+msgid "Font"
+msgstr ""
+
+#: ../../ui/composer.glade:99 ../../ui/composer.glade:614
+#: ../../ui/composer.glade:616
+msgid "Remove formatting"
+msgstr ""
+
+#: ../../ui/composer.glade:106
+msgid "Paste _with formatting"
+msgstr ""
+
+#: ../../ui/composer.glade:112
+msgid "Copy _link"
+msgstr ""
+
+#: ../../ui/composer.glade:141 ../../ui/composer.glade:569
+#: ../../ui/composer.glade:571
+msgid "Font size"
+msgstr ""
+
+#: ../../ui/composer.glade:171
+msgid "_Send"
+msgstr ""
+
+#: ../../ui/composer.glade:394
+msgid "Drop files here"
+msgstr ""
+
+#: ../../ui/composer.glade:410
+msgid "To add them as attachments"
+msgstr ""
+
+#: ../../ui/composer.glade:440 ../../ui/composer.glade:442
+msgid "Bold"
+msgstr ""
+
+#: ../../ui/composer.glade:455 ../../ui/composer.glade:457
+msgid "Italic"
+msgstr ""
+
+#: ../../ui/composer.glade:470 ../../ui/composer.glade:472
+msgid "Underline"
+msgstr ""
+
+#: ../../ui/composer.glade:485 ../../ui/composer.glade:487
+msgid "Strikethrough"
+msgstr ""
+
+#: ../../ui/composer.glade:512 ../../ui/composer.glade:514
+msgid "Indent"
+msgstr ""
+
+#: ../../ui/composer.glade:527 ../../ui/composer.glade:529
+msgid "Un-indent"
+msgstr ""
+
+#: ../../ui/composer.glade:554 ../../ui/composer.glade:556
+msgid "Fonts"
+msgstr ""
+
+#: ../../ui/composer.glade:584 ../../ui/composer.glade:586
+msgid "Color"
+msgstr ""
+
+#: ../../ui/composer.glade:599 ../../ui/composer.glade:601
+msgid "Link"
+msgstr ""
+
+#: ../../ui/login.glade:21
+msgid "Welcome to Geary."
+msgstr ""
+
+#: ../../ui/login.glade:99
+msgid "_Email address:"
+msgstr ""
+
+#: ../../ui/login.glade:115 ../../ui/password-dialog.glade:84
+msgid "_Password:"
+msgstr ""
+
+#: ../../ui/login.glade:144
+msgid "_Service:"
+msgstr ""
+
+#: ../../ui/login.glade:160
+msgid "N_ame:"
+msgstr ""
+
+#: ../../ui/login.glade:191
+msgid "Re_member password"
+msgstr ""
+
+#: ../../ui/login.glade:234 ../../ui/password-dialog.glade:374
+msgid "IMAP settings"
+msgstr ""
+
+#: ../../ui/login.glade:252
+msgid "Se_rver:"
+msgstr ""
+
+#: ../../ui/login.glade:284
+msgid "P_ort:"
+msgstr ""
+
+#: ../../ui/login.glade:344
+msgid "_No encryption"
+msgstr ""
+
+#: ../../ui/login.glade:364
+msgid "STARTTLS a_uthentication"
+msgstr ""
+
+#: ../../ui/login.glade:384
+msgid "SS_L/TLS encryption"
+msgstr ""
+
+#: ../../ui/login.glade:405
+msgid "STARTTLS aut_hentication"
+msgstr ""
+
+#: ../../ui/login.glade:426
+msgid "SSL/TLS encr_yption"
+msgstr ""
+
+#: ../../ui/login.glade:446
+msgid "No encrypt_ion"
+msgstr ""
+
+#: ../../ui/login.glade:471
+msgid "Ser_ver:"
+msgstr ""
+
+#: ../../ui/login.glade:488
+msgid "Por_t:"
+msgstr ""
+
+#: ../../ui/login.glade:506 ../../ui/password-dialog.glade:477
+msgid "SMTP settings"
+msgstr ""
+
+#: ../../ui/login.glade:524 ../../ui/login.glade:599
+#: ../../ui/password-dialog.glade:69 ../../ui/password-dialog.glade:202
+msgid "Username:"
+msgstr ""
+
+#: ../../ui/login.glade:539 ../../ui/login.glade:614
+#: ../../ui/password-dialog.glade:217
+msgid "Password:"
+msgstr ""
+
+#: ../../ui/login.glade:577 ../../ui/login.glade:652
+#: ../../ui/password-dialog.glade:256
+msgid "Remember password"
+msgstr ""
+
+#: ../../ui/login.glade:702 ../../ui/login.glade:718
+msgid "Encryption:"
+msgstr ""
+
+#: ../../ui/password-dialog.glade:129
+msgid "_Remember password"
+msgstr ""
+
+#: ../../ui/password-dialog.glade:151
+msgid "IMAP Credentials"
+msgstr ""
+
+#: ../../ui/password-dialog.glade:184
+msgid "SMTP Credentials"
+msgstr ""
+
+#: ../../ui/password-dialog.glade:299
+msgid "Service:"
+msgstr ""
+
+#: ../../ui/password-dialog.glade:314
+msgid "Real name:"
+msgstr ""
+
+#: ../../ui/password-dialog.glade:392 ../../ui/password-dialog.glade:495
+msgid "Server:"
+msgstr ""
+
+#: ../../ui/password-dialog.glade:407 ../../ui/password-dialog.glade:510
+msgid "Port:"
+msgstr ""
+
+#: ../../ui/password-dialog.glade:422 ../../ui/password-dialog.glade:525
+msgid "SSL/TLS encryption:"
+msgstr ""
+
+#: ../../ui/password-dialog.glade:588
+msgid "_Details"
+msgstr ""
+
+#. Button for creating a new email message
+#: ../../ui/toolbar.glade:13
+msgid "Compose message"
+msgstr ""
+
+#: ../../ui/toolbar.glade:29
+msgid "Reply to sender"
+msgstr ""
+
+#: ../../ui/toolbar.glade:31
+msgid "Reply To"
+msgstr ""
+
+#: ../../ui/toolbar.glade:45
+msgid "Reply to all"
+msgstr ""
+
+#: ../../ui/toolbar.glade:47
+msgid "Reply All"
+msgstr ""
+
+#: ../../ui/toolbar.glade:61
+msgid "Forward email"
+msgstr ""
+
+#: ../../ui/toolbar.glade:63
+msgid "Forward"
+msgstr ""
+
+#: ../../ui/toolbar.glade:88
+msgid "Delete the selected conversation"
+msgstr ""
+
+#: ../../ui/toolbar.glade:89
+msgid "Delete"
+msgstr ""
+
+#. Toggles menu for applying labels to emails.
+#: ../../ui/toolbar.glade:102
+msgid "Move the selected conversation"
+msgstr ""
+
+#. Toggles menu for applying labels to emails.
+#: ../../ui/toolbar.glade:117
+msgid "Label the selected conversation"
+msgstr ""
+
+#. Toggles menu for marking a message as read/unread or starred/unstarred
+#: ../../ui/toolbar.glade:143
+msgid "Mark email"
+msgstr ""
+
+#: ../../ui/toolbar.glade:175
+msgid "Menu"
+msgstr ""
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7f0e0b43..3d2ab956 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -415,7 +415,7 @@ include(GSettings)
 add_schemas(geary ${GSETTINGS_DIR})
 
 IF (XGETTEXT_FOUND)
-    GETTEXT_CREATE_POT(${GETTEXT_PACKAGE}.pot OPTION ${XGETTEXT_OPTIONS} SRC ${CLIENT_SRC} ${ENGINE_SRC} ${COMMON_SRC})
+    GETTEXT_CREATE_POT(${GETTEXT_PACKAGE}.pot OPTION ${XGETTEXT_OPTIONS} SRC ${CLIENT_SRC} ${ENGINE_SRC} ${COMMON_SRC} GLADE ${GLADE_FILES})
     GETTEXT_CREATE_TRANSLATIONS(${GETTEXT_PACKAGE}.pot ALL ${TRANSLATED}
 	COMMENT "Creating translations.")
 ELSE ()
diff --git a/src/client/geary-application.vala b/src/client/geary-application.vala
index 5b1ee3b3..93cd0a66 100644
--- a/src/client/geary-application.vala
+++ b/src/client/geary-application.vala
@@ -13,12 +13,18 @@ extern const string _SOURCE_ROOT_DIR;
 public class GearyApplication : YorbaApplication {
     public const string NAME = "Geary";
     public const string PRGNAME = "geary";
-    public const string DESCRIPTION = _("Email Client");
+    public const string DESCRIPTION = DESKTOP_GENERIC_NAME;
     public const string COPYRIGHT = _("Copyright 2011-2012 Yorba Foundation");
     public const string WEBSITE = "http://www.yorba.org";
     public const string WEBSITE_LABEL = _("Visit the Yorba web site");
     public const string BUGREPORT = "http://redmine.yorba.org/projects/geary/issues";
     
+    // These strings must match corresponding strings in desktop/geary.desktop *exactly* and be
+    // internationalizable
+    public const string DESKTOP_NAME = _("Geary");
+    public const string DESKTOP_GENERIC_NAME = _("Email Client");
+    public const string DESKTOP_COMMENT = _("Send and receive email");
+    
     public const string VERSION = _VERSION;
     public const string INSTALL_PREFIX = _INSTALL_PREFIX;
     public const string GSETTINGS_DIR = _GSETTINGS_DIR;
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 062f678e..cba16c40 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -10,3 +10,7 @@ install(FILES preferences.glade DESTINATION ${UI_DEST})
 install(FILES toolbar.glade DESTINATION ${UI_DEST})
 install(FILES toolbar_mark_menu.ui DESTINATION ${UI_DEST})
 install(FILES toolbar_menu.ui DESTINATION ${UI_DEST})
+
+#
+# NOTE: Update GLADE_FILES in ../CMakeLists.txt with additions and removals
+#