diff --git a/installer/config.php b/installer/config.php
index 0e4ac5af2..82d7f55d6 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -671,6 +671,27 @@ echo $select_param_folding->show(strval($RCI->getprop('mime_param_folding')));
 <p class="hint"><span class="userconf">*</span>&nbsp; These settings are defaults for the user preferences</p>
 </fieldset>
 
+
+<fieldset>
+<legend>Plugins</legend>
+<dl class="configblock" id="cgfblockdisplay">
+
+<?php
+$plugins = $RCI->list_plugins();
+foreach($plugins as $p) 
+{
+	$p_check = new html_checkbox(array('name' => '_plugins_'.$p['name'], 'id' => 'cfgplugin_'.$p['name']));
+	echo '<dt class="propname">'.$p['name'].'</dt><dd>';
+	echo $p_check->show(0, array('value' => $p['name']));
+	echo '<label for="cfgplugin_'.$p['name'].'">'.$p['desc'].'</label><br/></dd>';
+}
+
+?>
+</dl>
+
+<p class="hint">Please consider checking dependencies of enabled plugins</p>
+</fieldset>
+
 <?php
 
 echo '<p><input type="submit" name="submit" value="' . ($RCI->configured ? 'UPDATE' : 'CREATE') . ' CONFIG" ' . ($RCI->failures ? 'disabled' : '') . ' /></p>';
diff --git a/program/include/rcmail_install.php b/program/include/rcmail_install.php
index 96e0afbd4..26c613a11 100644
--- a/program/include/rcmail_install.php
+++ b/program/include/rcmail_install.php
@@ -234,6 +234,14 @@ class rcmail_install
       else if (is_numeric($value)) {
         $value = intval($value);
       }
+      else if ($prop == 'plugins') {
+        $value = array();
+        foreach(array_keys($_POST) as $key)
+        {
+          if (preg_match('/^_plugins_*/', $key))
+            array_push($value, $_POST[$key]);
+        }
+      }
 
       // skip this property
       if (($value == $this->defaults[$prop]) && !in_array($prop, $this->local_config)
@@ -558,6 +566,34 @@ class rcmail_install
     return $skins;
   }
 
+  /**
+  * Return a list with available subfolders of the plugins directory
+  * (with their associated description in composer.json)
+  */
+  function list_plugins() 
+  {
+    $plugins = array();
+    $plugin_dir = INSTALL_PATH . 'plugins/';
+
+    foreach (glob($plugin_dir . '*') as $path) 
+    {
+
+      if (is_dir($path) && file_exists($path.'/composer.json')) 
+      {
+        $file_json = json_decode(file_get_contents($path.'/composer.json'));
+        $plugin_desc = $file_json->description;
+      }
+      else
+      {
+        $plugin_desc = 'N/A';
+      }
+
+      $plugins[] = array('name' => substr($path, strlen($plugin_dir)), 'desc' => $plugin_desc);
+    }
+
+    return $plugins;
+  }
+
   /**
    * Display OK status
    *