diff --git a/plugins/Imap/ImapPlugin.php b/plugins/Imap/ImapPlugin.php
index 8d8dbf223f..dbaa904c6e 100644
--- a/plugins/Imap/ImapPlugin.php
+++ b/plugins/Imap/ImapPlugin.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Plugin to add a StatusNet Facebook application
+ * IMAP plugin to allow StatusNet to grab incoming emails and handle them as new user posts
  *
  * PHP version 5
  *
@@ -51,16 +51,21 @@ class ImapPlugin extends Plugin
 
     function initialize(){
         if(!isset($this->mailbox)){
-            throw new Exception(_m("A mailbox must be specified."));
+            // TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+            throw new Exception(_m('A mailbox must be specified.'));
         }
         if(!isset($this->user)){
-            throw new Exception(_m("A user must be specified."));
+            // TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+            throw new Exception(_m('A user must be specified.'));
         }
         if(!isset($this->password)){
-            throw new Exception(_m("A password must be specified."));
+            // TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+            throw new Exception(_m('A password must be specified.'));
         }
         if(!isset($this->poll_frequency)){
-            throw new Exception(_m("A poll_frequency must be specified."));
+            // TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+            // TRANS: poll_frequency is a setting that should not be translated.
+            throw new Exception(_m('A poll_frequency must be specified.'));
         }
 
         return true;
@@ -100,6 +105,7 @@ class ImapPlugin extends Plugin
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:IMAP',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for incoming mail containing user posts.'));
         return true;
     }
diff --git a/plugins/Imap/imapmailhandler.php b/plugins/Imap/imapmailhandler.php
index 92abf64747..e287523eef 100644
--- a/plugins/Imap/imapmailhandler.php
+++ b/plugins/Imap/imapmailhandler.php
@@ -27,6 +27,7 @@ class IMAPMailHandler extends MailHandler
     {
         $this->log(LOG_INFO, "Error: $from $msg");
         $headers['To'] = $from;
+        // TRANS: E-mail subject in case of an error.
         $headers['Subject'] = _m('Error');
 
         return mail_send(array($from), $headers, $msg);
diff --git a/plugins/Imap/imapmanager.php b/plugins/Imap/imapmanager.php
index 2d27ac97a8..835de89106 100644
--- a/plugins/Imap/imapmanager.php
+++ b/plugins/Imap/imapmanager.php
@@ -48,7 +48,8 @@ class ImapManager extends IoManager
      */
     public static function get()
     {
-        throw new Exception(_m('ImapManager should be created using its constructor, not the using the static get method.'));
+        // TRANS: Exception thrown when the ImapManager is used incorrectly in the code.
+        throw new Exception(_m('ImapManager should be created using its constructor, not the using the static "get()" method.'));
     }
 
     /**