diff --git a/lib/email/Email.inc b/lib/email/Email.inc
index a5fa966..3488e5e 100644
--- a/lib/email/Email.inc
+++ b/lib/email/Email.inc
@@ -43,6 +43,8 @@ class Email {
         // create a new phpmailer object.
         require_once(KT_DIR .  '/thirdparty/phpmailer/class.phpmailer.php');
         $this->oMailer = new phpmailer();
+		$this->oMailer->Encoding = 'base64';
+		$this->oMailer->CharSet = 'utf-8';
         $this->oMailer->isSMTP();
         $this->oMailer->Host = $default->emailServer;
         $this->oMailer->From = (strlen($sFromEmail) == 0) ? $default->emailFrom : $sFromEmail;
diff --git a/lib/plugins/plugin.inc.php b/lib/plugins/plugin.inc.php
index 8cb1283..7bf3843 100644
--- a/lib/plugins/plugin.inc.php
+++ b/lib/plugins/plugin.inc.php
@@ -32,6 +32,8 @@ class KTPlugin {
     var $bAlwaysInclude = false;
     var $iVersion = 0;
     
+    var $autoRegister = false;
+    
     var $_aPortlets = array();
     var $_aTriggers = array();
     var $_aActions = array();
@@ -227,12 +229,13 @@ class KTPlugin {
             ));
             return $oEntity;
         }
-
+        $disabled = 1;
+        if ($this->bAlwaysInclude || $this->autoRegister) { $disabled = 0; }
         $oEntity = KTPluginEntity::createFromArray(array(
             'namespace' => $this->sNamespace,
             'path' => $this->stripKtDir($this->sFilename),
             'version' => $this->iVersion,
-            'disabled' => 0,
+            'disabled' => $disabled,
         ));
         if (PEAR::isError($oEntity)) {
             return $oEntity;
diff --git a/plugins/ktstandard/KTDiscussion.php b/plugins/ktstandard/KTDiscussion.php
index 7d48e46..a4e42fc 100644
--- a/plugins/ktstandard/KTDiscussion.php
+++ b/plugins/ktstandard/KTDiscussion.php
@@ -32,6 +32,7 @@ require_once(KT_LIB_DIR . '/discussions/DiscussionComment.inc');
 
 class KTDiscussionPlugin extends KTPlugin {
     var $sNamespace = "ktstandard.discussion.plugin";
+    var $autoRegister = true;
 
     function setup() {
         $this->registerAction('documentaction', 'KTDocumentDiscussionAction', 'ktcore.actions.document.discussion');
diff --git a/plugins/ktstandard/KTIndexer.php b/plugins/ktstandard/KTIndexer.php
index f8ff23a..92343f2 100644
--- a/plugins/ktstandard/KTIndexer.php
+++ b/plugins/ktstandard/KTIndexer.php
@@ -28,6 +28,7 @@
 
 class KTIndexerPlugin extends KTPlugin {
     var $sNamespace = "ktstandard.indexer.plugin";
+    var $autoRegister = true;
 
     function setup() {
         $this->registerTrigger('content', 'transform', 'KTWordIndexerTrigger',
diff --git a/plugins/ktstandard/KTLDAPAuthenticationPlugin.php b/plugins/ktstandard/KTLDAPAuthenticationPlugin.php
index 17590b1..aec6bc8 100644
--- a/plugins/ktstandard/KTLDAPAuthenticationPlugin.php
+++ b/plugins/ktstandard/KTLDAPAuthenticationPlugin.php
@@ -31,6 +31,7 @@ require_once(KT_LIB_DIR . '/plugins/pluginregistry.inc.php');
 
 class KTLDAPAuthenticationPlugin extends KTPlugin {
     var $sNamespace = "ktstandard.ldapauthentication.plugin";
+    var $autoRegister = true;
 
     function setup() {
         $this->registerAuthenticationProvider('LDAP Authentication',
diff --git a/plugins/ktstandard/KTSubscriptions.php b/plugins/ktstandard/KTSubscriptions.php
index 4fd3efc..2413606 100644
--- a/plugins/ktstandard/KTSubscriptions.php
+++ b/plugins/ktstandard/KTSubscriptions.php
@@ -40,6 +40,7 @@ require_once(KT_LIB_DIR . '/actions/folderaction.inc.php');
 
 class KTSubscriptionPlugin extends KTPlugin {
     var $sNamespace = "ktstandard.subscriptions.plugin";
+    var $autoRegister = true;
 
     function setup() {
         $this->registerPortlet('browse', 'KTSubscriptionPortlet',
diff --git a/plugins/ktstandard/SearchDashletPlugin.php b/plugins/ktstandard/SearchDashletPlugin.php
index ec95166..c58058a 100644
--- a/plugins/ktstandard/SearchDashletPlugin.php
+++ b/plugins/ktstandard/SearchDashletPlugin.php
@@ -31,6 +31,7 @@ require_once(KT_LIB_DIR . '/plugins/pluginregistry.inc.php');
 
 class SearchDashletPlugin extends KTPlugin {
     var $sNamespace = "ktstandard.searchdashlet.plugin";
+    var $autoRegister = true;
 
     function setup() {
         $this->registerDashlet('SearchDashlet', 'ktstandard.searchdashlet.dashlet', 'SearchDashlet.php');
diff --git a/templates/ktcore/edit_lookuptrees.smarty b/templates/ktcore/edit_lookuptrees.smarty
index 3ec3d22..a49832d 100644
--- a/templates/ktcore/edit_lookuptrees.smarty
+++ b/templates/ktcore/edit_lookuptrees.smarty
@@ -91,7 +91,7 @@ make it available.{/i18n}</p></div>
 <h2>{i18n}Preview{/i18n}</h2>
 <div><p class="descriptiveText">
     {i18n}Use the +/- arrows to open or close the tree.  Bold items are metadata keywords.
-    To edit a category (including adding or removing keywords) click on the "edit" link.{/i18n}
+    To edit a category (including adding or removing keywords) click on the "attach keywords" link next to it.{/i18n}
     </p>
 </div>