diff --git a/po/POTFILES.in b/po/POTFILES.in
index acc160a3..60434fb5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -114,10 +114,19 @@ src/client/plugin/email-templates/email-templates.plugin.desktop.in
 src/client/plugin/email-templates/email-templates.vala
 src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in
 src/client/plugin/folder-highlight/folder-highlight.vala
+src/client/plugin/mail-merge/mail-merge-csv.vala
+src/client/plugin/mail-merge/mail-merge-folder.vala
+src/client/plugin/mail-merge/mail-merge-processor.vala
+src/client/plugin/mail-merge/mail-merge-test-processor.vala
+src/client/plugin/mail-merge/mail-merge-test-reader.vala
+src/client/plugin/mail-merge/mail-merge-test.vala
+src/client/plugin/mail-merge/mail-merge.plugin.desktop.in
+src/client/plugin/mail-merge/mail-merge.vala
 src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in
 src/client/plugin/messaging-menu/messaging-menu.vala
 src/client/plugin/notification-badge/notification-badge.plugin.desktop.in
 src/client/plugin/notification-badge/notification-badge.vala
+src/client/plugin/notification-badge/unity-launcher-entry.vala
 src/client/plugin/sent-sound/sent-sound.plugin.desktop.in
 src/client/plugin/sent-sound/sent-sound.vala
 src/client/plugin/special-folders/special-folders.plugin.desktop.in
diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index 8e6705ab..e8428459 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -564,7 +564,7 @@ public class Application.MainWindow :
             // Translators: An info bar status label
             _("Security problem"),
             // Translators: An info bar description label
-            _("An account has reported an untrusted server..")
+            _("An account has reported an untrusted server.")
         );
         // Translators: An info bar button label
         var cert_retry = new Gtk.Button.with_label(_("Check"));
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index a420e5d0..176c60df 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -846,7 +846,7 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
             if (message.has_html_body()) {
                 body = message.get_html_body(null);
                 body_complete = body.contains(
-                    """id="%s"""".printf(WebView.BODY_HTML_ID)
+                    "id=\"%s\"".printf(WebView.BODY_HTML_ID)
                 );
             } else {
                 body = message.get_plain_body(true, null);
diff --git a/src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in b/src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in
index 2019963a..4681890b 100644
--- a/src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in
+++ b/src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in
@@ -1,4 +1,5 @@
 [Plugin]
 Module=desktop-notifications
+# Translators: This is an internal plugin so this name does not need
+# to be tanslated
 Name=Desktop Notifications
-Description=Displays desktop notifications when new email is delivered
diff --git a/src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in b/src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in
index f0ca9f97..5cd8bb37 100644
--- a/src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in
+++ b/src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in
@@ -1,4 +1,5 @@
 [Plugin]
 Module=folder-highlight
+# Translators: This is an internal plugin so this name does not need
+# to be tanslated
 Name=Folder Highlight
-Description=Highlights folders that have newly delivered mail
diff --git a/src/client/plugin/notification-badge/notification-badge.plugin.desktop.in b/src/client/plugin/notification-badge/notification-badge.plugin.desktop.in
index 55330121..c3b6e89d 100644
--- a/src/client/plugin/notification-badge/notification-badge.plugin.desktop.in
+++ b/src/client/plugin/notification-badge/notification-badge.plugin.desktop.in
@@ -1,4 +1,5 @@
 [Plugin]
 Module=notification-badge
+# Translators: This is an internal plugin so this name does not need
+# to be tanslated.
 Name=Notification Badge
-Description=Displays a dock badge showing the number of new messages
diff --git a/src/client/plugin/special-folders/special-folders.plugin.desktop.in b/src/client/plugin/special-folders/special-folders.plugin.desktop.in
index 4e5e4ff4..901dc045 100644
--- a/src/client/plugin/special-folders/special-folders.plugin.desktop.in
+++ b/src/client/plugin/special-folders/special-folders.plugin.desktop.in
@@ -1,3 +1,5 @@
 [Plugin]
 Module=special-folders
+# Translators: This is an internal plugin so this name does not need
+# to be tanslated.
 Name=Special Folders