diff --git a/plugin.manifest b/plugin.manifest
index 3228f522c79bd7d2ca8fddad9608caf05c3f6c8d..cad0c731469720a1bc547fb1557a964115790c9e 100755
--- a/plugin.manifest
+++ b/plugin.manifest
@@ -1,7 +1,7 @@
 pluginname=Aladdin
 pluginclassname=Aladdin
 origin=intelec
-version=2.1
+version=2.1.1
 studipMinVersion=3.1
 dbscheme=install.sql
 uninstalldbscheme=uninstall.sql
diff --git a/views/lamp/_linked_brainstorm.php b/views/lamp/_linked_brainstorm.php
index a8bffe4c63e301a86133d2edc76f7866376cc704..d0c4114e55d64b1712d32d00545a31d0b611a8b1 100755
--- a/views/lamp/_linked_brainstorm.php
+++ b/views/lamp/_linked_brainstorm.php
@@ -6,6 +6,9 @@
         </div>
     </a>
     <? if ($GLOBALS['perm']->have_studip_perm("tutor", $_SESSION['SessionSeminar']) || $GLOBALS['user']->id === $brainstorm['user_id']) : ?>
+        <a class="edit" href="<?= PluginEngine::getLink($plugin, array(), "lamp/edit/".$brainstorm->getId()) ?>" data-dialog>
+            <?= Icon::create("edit", "clickable")->asImg(20) ?>
+        </a>
         <a class="delete" href="<?= PluginEngine::getLink($plugin, array(), "lamp/delete/".$brainstorm->getId()) ?>" onClick="return window.confirm('<?= _("Wirklich l�schen?") ?>');">
             <?= Icon::create("trash", "clickable")->asImg(20) ?>
         </a>
diff --git a/views/lamp/brainstorm.php b/views/lamp/brainstorm.php
index e93920670e56820109a0c6bce2403156ee619a9d..a09edf2d62bfe501caebb604589934a8bbfb38a0 100755
--- a/views/lamp/brainstorm.php
+++ b/views/lamp/brainstorm.php
@@ -19,6 +19,14 @@
         <div class="body">
             <?= formatReady($brainstorm->text) ?>
         </div>
+        <? if ($GLOBALS['perm']->have_studip_perm("tutor", $_SESSION['SessionSeminar']) || $GLOBALS['user']->id === $brainstorm['user_id']) : ?>
+            <a class="edit" href="<?= PluginEngine::getLink($plugin, array(), "lamp/edit/".$brainstorm->getId()) ?>" data-dialog>
+                <?= Icon::create("edit", "clickable")->asImg(20) ?>
+            </a>
+            <a class="delete" href="<?= PluginEngine::getLink($plugin, array(), "lamp/delete/".$brainstorm->getId()) ?>" onClick="return window.confirm('<?= _("Wirklich l�schen?") ?>');">
+                <?= Icon::create("trash", "clickable")->asImg(20) ?>
+            </a>
+        <? endif ?>
     </div>
 
     <hr style="display: block; border: 0px; height: 2px; background-color: #dddddd; width: 50%; margin: 30px; margin-left: auto; margin-right: auto;">
diff --git a/views/lamp/edit.php b/views/lamp/edit.php
index 5f7839dea9a78a6abc5c12e072128f9b7291913f..701e70080c7523686b7ca39bee8dda2acb6e0b98 100755
--- a/views/lamp/edit.php
+++ b/views/lamp/edit.php
@@ -17,6 +17,6 @@
     </label>
     
     <div data-dialog-button>
-        <?= \Studip\Button::create(_('Anlegen'), 'create') ?>
+        <?= \Studip\Button::create(_('Speichern'), 'create') ?>
     </div>
 </form>
\ No newline at end of file