diff --git a/plugins/date/form_date.cs b/plugins/date/form_date.cs
index fe378b1..ea2c8e6 100644
--- a/plugins/date/form_date.cs
+++ b/plugins/date/form_date.cs
@@ -2,6 +2,8 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.date.Title.ConfigDate) ?></h1>
 
+<?cs call:handle_messages() ?>
+
 <?cs call:print_form_header("set_date", "date") ?>
 
 	<p><label for="date"><?cs var:html_escape(Lang.Plugins.date.Text.Date) ?>: </label><br/>
@@ -34,9 +36,11 @@
 					else ?><option><?cs /if ?><?cs if:x<10 ?>0<?cs /if ?><?cs var:x ?></option><?cs /loop ?>
 		</select></p>
 	
-	<input type="hidden" name="store" value="yes" />
+	<p><input type="hidden" name="store" value="yes" />
 
-	<button type="submit" tabindex="6"><?cs var:html_escape(Lang.Plugins.date.Button.ConfigDate) ?></button>
+	<button type="submit" tabindex="6"><?cs var:html_escape(Lang.Plugins.date.Button.ConfigDate) ?></button></p>
 
 </form>
 
+<?cs call:help_link("CryptoBoxUserConfiguration") ?>
+
diff --git a/plugins/disks/disks.cs b/plugins/disks/disks.cs
index 099d77e..8857774 100644
--- a/plugins/disks/disks.cs
+++ b/plugins/disks/disks.cs
@@ -2,6 +2,8 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.disks.Title.Disks) ?></h1>
 
+<?cs call:handle_messages() ?>
+
 <?cs # TODO: add no-disks-available warning ?>
 
 <?cs if:subcount(Data.Disks) == 0 ?>
diff --git a/plugins/help/doc.cs b/plugins/help/doc.cs
index af93071..f163cb7 100644
--- a/plugins/help/doc.cs
+++ b/plugins/help/doc.cs
@@ -1,5 +1,7 @@
 <?cs # $Id$ ?>
 
+<?cs call:handle_messages() ?>
+
 <div id="doc">
 
 <?cs include:Settings.DocDir + '/' + Settings.Language + '/' + Data.Plugins.help.Page + '.html' ?>
diff --git a/plugins/language_selection/language_selection.cs b/plugins/language_selection/language_selection.cs
index cae329c..4e7b213 100644
--- a/plugins/language_selection/language_selection.cs
+++ b/plugins/language_selection/language_selection.cs
@@ -2,6 +2,8 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.language_selection.Title.Language) ?></h1>
 
+<?cs call:handle_messages() ?>
+
 <div id="lang">
 	<ul>
 		<?cs loop:index = #0, subcount(Data.Languages)-1, #1 ?>
diff --git a/plugins/logs/show_log.cs b/plugins/logs/show_log.cs
index 623b4b7..d6f225a 100644
--- a/plugins/logs/show_log.cs
+++ b/plugins/logs/show_log.cs
@@ -4,12 +4,12 @@
 <?cs include:Data.Plugins.logs.StyleSheetFile ?>
 </style>
 
+<h1><?cs var:html_escape(Lang.Plugins.logs.Title.Log) ?></h1>
+
+<?cs call:handle_messages() ?>
+
 <div id="log">
 
-	<h1><?cs var:html_escape(Lang.Plugins.logs.Title.Log) ?></h1>
-
-	<?cs call:handle_messages() ?>
-
 	<?cs if:Data.Plugins.logs.Content ?>
 		<p class="console"><?cs var:Data.Plugins.logs.Content ?></p>
 	<?cs else ?>
diff --git a/plugins/network/form_network.cs b/plugins/network/form_network.cs
index 107459d..509e2d5 100644
--- a/plugins/network/form_network.cs
+++ b/plugins/network/form_network.cs
@@ -6,6 +6,8 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.network.Title.Network) ?></h1>
 
+<?cs call:handle_messages() ?>
+
 <?cs call:print_form_header("set_ip", "network") ?>
 
 	<p><label for="ip"><?cs var:html_escape(Lang.Plugins.network.Text.IP) ?>: </label>
diff --git a/plugins/partition/select_device.cs b/plugins/partition/select_device.cs
index adbe58a..6458bff 100644
--- a/plugins/partition/select_device.cs
+++ b/plugins/partition/select_device.cs
@@ -4,6 +4,8 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.partition.Title.Partition) ?></h1>
 
+<?cs call:handle_messages() ?>
+
 <?cs if:subcount(Data.Plugins.partition.BlockDevices) > 0 ?>
 
 	<?cs call:print_form_header("select_device", "partition") ?>
@@ -41,3 +43,5 @@
 
 <?cs # a warning will be displayed if there are no disks available ?>
 
+<?cs call:help_link("CryptoBoxUserConfiguration") ?>
+
diff --git a/plugins/partition/set_partitions.cs b/plugins/partition/set_partitions.cs
index 5d52c61..6e80b4d 100644
--- a/plugins/partition/set_partitions.cs
+++ b/plugins/partition/set_partitions.cs
@@ -7,6 +7,8 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.partition.Title.Partition) ?></h1>
 
+<?cs call:handle_messages() ?>
+
 <div align="center">
 <table class="partition">
 	<tr>
@@ -74,5 +76,7 @@
 	</ul></p>
 <?cs /if ?>
 
+<?cs call:help_link("CryptoBoxUserConfiguration") ?>
+
 <?cs /if ?>
 
diff --git a/plugins/partition/show_format_progress.cs b/plugins/partition/show_format_progress.cs
index d5530ab..126d37b 100644
--- a/plugins/partition/show_format_progress.cs
+++ b/plugins/partition/show_format_progress.cs
@@ -4,6 +4,8 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.partition.Title.Partition) ?></h1>
 
+<?cs call:handle_messages() ?>
+
 <p><?cs var:html_escape(Lang.Plugins.partition.Text.ProgressInfo) ?>
 	<ul>
 		<?cs loop: x = #0, subcount(Data.Plugins.partition.Parts)-1, #1 ?>
diff --git a/plugins/plugin-interface.txt b/plugins/plugin-interface.txt
index ef0de4b..a90f379 100644
--- a/plugins/plugin-interface.txt
+++ b/plugins/plugin-interface.txt
@@ -58,6 +58,7 @@ Language file structure:
 
 Clearsilver template:
 	- should start with a "<h1>" tag (volume plugins: "h3")
+	- the title should be followd by '<?cs call:handle_messages() ?>'
 	- links to the plugin (e.g. in form headers) could look like the following:
 		<?cs call:link("PLUGINNAME",'','','','') ?>
 
diff --git a/plugins/plugin_manager/plugin_list.cs b/plugins/plugin_manager/plugin_list.cs
index b0c8b82..6fbd194 100644
--- a/plugins/plugin_manager/plugin_list.cs
+++ b/plugins/plugin_manager/plugin_list.cs
@@ -16,6 +16,7 @@
 	}
 
 	table.plugin_list a img {
+moved
 		border: none;
 	}
 </style>
@@ -23,6 +24,8 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.plugin_manager.Title.PluginManager) ?></h1>
 
+<?cs call:handle_messages() ?>
+
 <?cs # just as a sidenote: we add the strange 'x' argument below to prevent the browser
 	from thinking, that it can use the cached page again, if a user calls the "down" or
 	"up" action twice for the same plugin ?>
@@ -59,9 +62,9 @@ each:x = Settings.PluginList ?><?cs if:(x.Rank == index) && x.Types.volume
 		<td><input type="checkbox" name="<?cs var:name(x) ?>_auth" <?cs if:x.RequestAuth ?>checked="checked"<?cs /if ?> /></td>
 		<td>
 			<?cs if:run_counter != all_count ?><a href="<?cs call:link("plugin_manager", "plugin_name", name(x), "action", "down") ?>&x=<?cs var:run_counter ?>#volume_plugins">
-				<img src="icons/plugin_manager?image=tango-go-down.png" alt="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Down) ?>" title="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Down) ?>" /></a><?cs /if ?>
+				<img src="icons/plugin_manager?image=tango-go-down.gif" alt="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Down) ?>" title="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Down) ?>" /></a><?cs /if ?>
 			<?cs if:run_counter != 1 ?><a href="<?cs call:link("plugin_manager", "plugin_name", name(x), "action", "up") ?>&x=<?cs var:run_counter ?>#volume_plugins" >
-				<img src="icons/plugin_manager?image=tango-go-up.png" alt="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" title="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" /></a><?cs /if ?>
+				<img src="icons/plugin_manager?image=tango-go-up.gif" alt="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" title="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" /></a><?cs /if ?>
 			<input type="hidden" name="<?cs var:html_escape(name(x)) ?>_rank" value="<?cs var:html_escape(x.Rank) ?>" />
 			<input type="hidden" name="<?cs var:name(x) ?>_listed" value="1" /></td>
 	</tr><?cs /if ?><?cs /each ?><?cs /loop ?>
@@ -98,9 +101,9 @@ each:x = Settings.PluginList ?><?cs if:(x.Rank == index) && !x.Types.volume
 		<td><input type="checkbox" name="<?cs var:name(x) ?>_auth" <?cs if:x.RequestAuth ?>checked="checked"<?cs /if ?> /></td>
 		<td>
 			<?cs if:run_counter != all_count ?><a href="<?cs call:link("plugin_manager", "plugin_name", name(x), "action", "down") ?>&x=<?cs var:run_counter ?>#system_plugins">
-				<img src="icons/plugin_manager?image=tango-go-down.png" alt="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Down) ?>" title="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Down) ?>" /></a><?cs /if ?>
+				<img src="icons/plugin_manager?image=tango-go-down.gif" alt="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Down) ?>" title="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Down) ?>" /></a><?cs /if ?>
 			<?cs if:run_counter != 1 ?><a href="<?cs call:link("plugin_manager", "plugin_name", name(x), "action", "up") ?>&x=<?cs var:run_counter ?>#<?cs var:html_escape(name(x)) ?>" >
-				<img src="icons/plugin_manager?image=tango-go-up.png" alt="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" title="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" /></a><?cs /if ?>
+				<img src="icons/plugin_manager?image=tango-go-up.gif" alt="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" title="<?cs var:html_escape(Lang.Plugins.plugin_manager.Button.Up) ?>" /></a><?cs /if ?>
 			<input type="hidden" name="<?cs var:html_escape(name(x)) ?>_rank" value="<?cs var:html_escape(x.Rank) ?>" />
 			<input type="hidden" name="<?cs var:name(x) ?>_listed" value="1" /></td>
 	</tr><?cs /if ?><?cs /each ?><?cs /loop ?>
@@ -113,4 +116,5 @@ each:x = Settings.PluginList ?><?cs if:(x.Rank == index) && !x.Types.volume
 
 </form>
 
+<?cs call:help_link("CryptoBoxUserConfiguration") ?>
 
diff --git a/plugins/shutdown/form_shutdown.cs b/plugins/shutdown/form_shutdown.cs
index 81e07be..5f80441 100644
--- a/plugins/shutdown/form_shutdown.cs
+++ b/plugins/shutdown/form_shutdown.cs
@@ -2,12 +2,17 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.shutdown.Title.Shutdown) ?></h1>
 
+<?cs call:handle_messages() ?>
+
 <div class="plugin_system">
 	<a href="<?cs call:link('shutdown','type','shutdown','','') ?>">
-	<img src="<?cs call:link('icons/shutdown','image','gnome-shutdown.png','','')
+	<img src="<?cs call:link('icons/shutdown','image','gnome-shutdown.gif','','')
 	?>" alt="icon: shutdown" /><br/><?cs var:html_escape(Lang.Plugins.shutdown.Button.Shutdown) ?></a></div>
 
 <div class="plugin_system">
 	<a href="<?cs call:link('shutdown','type','reboot','','') ?>">
-	<img src="<?cs call:link('icons/shutdown','image','gnome-reboot.png','','')
+	<img src="<?cs call:link('icons/shutdown','image','gnome-reboot.gif','','')
 	?>" alt="icon: reboot" /><br/><?cs var:html_escape(Lang.Plugins.shutdown.Button.Reboot) ?></a></div>
+
+<?cs call:help_link("CryptoBoxUserConfiguration") ?>
+
diff --git a/plugins/shutdown/progress_reboot.cs b/plugins/shutdown/progress_reboot.cs
index 3e5eba6..d36ce78 100644
--- a/plugins/shutdown/progress_reboot.cs
+++ b/plugins/shutdown/progress_reboot.cs
@@ -2,3 +2,5 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.shutdown.Title.ProgressReboot) ?></h1>
 
+<?cs call:handle_messages() ?>
+
diff --git a/plugins/shutdown/progress_shutdown.cs b/plugins/shutdown/progress_shutdown.cs
index a0d1aad..a4afd10 100644
--- a/plugins/shutdown/progress_shutdown.cs
+++ b/plugins/shutdown/progress_shutdown.cs
@@ -2,3 +2,5 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.shutdown.Title.ProgressShutdown) ?></h1>
 
+<?cs call:handle_messages() ?>
+
diff --git a/plugins/system_preferences/show_plugins.cs b/plugins/system_preferences/show_plugins.cs
index a38ab79..6946f78 100644
--- a/plugins/system_preferences/show_plugins.cs
+++ b/plugins/system_preferences/show_plugins.cs
@@ -2,6 +2,8 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.system_preferences.Title.Preferences) ?></h1>
 
+<?cs call:handle_messages() ?>
+
 <?cs # sort the Plugins - using the most stupid way :) ?>
 <?cs loop: order = #0, #100, #1
 	?><?cs # plugins ?><?cs each:x = Settings.PluginList
diff --git a/plugins/user_manager/user_list.cs b/plugins/user_manager/user_list.cs
index 1dbdea3..4a7f3f4 100644
--- a/plugins/user_manager/user_list.cs
+++ b/plugins/user_manager/user_list.cs
@@ -11,7 +11,7 @@
 
 <h1><?cs var:html_escape(Lang.Plugins.user_manager.Title.UserManager) ?></h1>
 
-
+<?cs call:handle_messages() ?>
 
 <h2><?cs var:html_escape(Lang.Plugins.user_manager.Title.AddUser) ?></h2>
 	<?cs call:print_form_header("add_user", "user_manager") ?>
@@ -72,3 +72,5 @@
 	</form></td></tr></table>
 <?cs /if ?>
 
+<?cs call:help_link("CryptoBoxUserConfiguration") ?>
+
diff --git a/plugins/volume_automount/volume_automount.cs b/plugins/volume_automount/volume_automount.cs
index 5c57ca9..9bb26e1 100644
--- a/plugins/volume_automount/volume_automount.cs
+++ b/plugins/volume_automount/volume_automount.cs
@@ -2,6 +2,8 @@
 
 <h3><?cs var:html_escape(Lang.Plugins.volume_automount.Title.AutoMountVolume) ?></h3>
 
+<?cs call:handle_messages() ?>
+
 <?cs if:!Data.CurrentDisk.encryption ?>
 	<p><?cs call:print_form_header("automount", "volume_automount") ?>
 		<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
@@ -19,3 +21,5 @@
 	<?cs call:hint("Plugins.volume_automount.NoAutoMountForEncryptedVolumes") ?>
 <?cs /if ?>
 
+<?cs call:help_link("CryptoBoxUserConfiguration") ?>
+
diff --git a/plugins/volume_chpasswd/volume_chpasswd.cs b/plugins/volume_chpasswd/volume_chpasswd.cs
index 92395e1..bdd8823 100644
--- a/plugins/volume_chpasswd/volume_chpasswd.cs
+++ b/plugins/volume_chpasswd/volume_chpasswd.cs
@@ -2,6 +2,8 @@
 
 <h3><?cs var:html_escape(Lang.Plugins.volume_chpasswd.Title.ChangePassword) ?></h3>
 
+<?cs call:handle_messages() ?>
+
 <?cs # show password change form only for encrypted volumes ?>
 <?cs if:Data.CurrentDisk.encryption ?>
 	<?cs call:print_form_header("set_password", "volume_chpasswd") ?>
@@ -31,3 +33,5 @@
 	<?cs call:hint("Plugins.volume_chpasswd.FormatForEncryptionSupport") ?>
 <?cs /if ?>
 
+<?cs call:help_link("CryptoBoxUserConfiguration") ?>
+
diff --git a/plugins/volume_details/volume_details.cs b/plugins/volume_details/volume_details.cs
index 5be6f9f..4df7ed5 100644
--- a/plugins/volume_details/volume_details.cs
+++ b/plugins/volume_details/volume_details.cs
@@ -2,6 +2,8 @@
 
 <h3><?cs var:html_escape(Lang.Plugins.volume_details.Title.Details) ?></h3>
 
+<?cs call:handle_messages() ?>
+
 <ul>
 	<li><?cs var:html_escape(Lang.Text.ContainerName) ?>: <?cs var:html_escape(Data.CurrentDisk.name) ?></li>
 	<li><?cs var:html_escape(Lang.Plugins.volume_details.Text.DeviceName) ?>: <?cs var:html_escape(Data.CurrentDisk.device) ?></li>
diff --git a/plugins/volume_format_fs/volume_format.cs b/plugins/volume_format_fs/volume_format.cs
index a781e9f..0578974 100644
--- a/plugins/volume_format_fs/volume_format.cs
+++ b/plugins/volume_format_fs/volume_format.cs
@@ -2,6 +2,8 @@
 
 <h3><?cs var:html_escape(Lang.Plugins.volume_format_fs.Title.Format) ?></h3>
 
+<?cs call:handle_messages() ?>
+
 <?cs if:Data.CurrentDisk.active ?>
 	<?cs call:hint("Plugins.volume_format_fs.UnmountBeforeInit") ?>
 <?cs else ?>
@@ -30,3 +32,5 @@
 
 <?cs /if ?>
 
+<?cs call:help_link("CryptoBoxUserConfiguration") ?>
+
diff --git a/plugins/volume_format_fs/volume_format_luks.cs b/plugins/volume_format_fs/volume_format_luks.cs
index fe13884..90f1c12 100644
--- a/plugins/volume_format_fs/volume_format_luks.cs
+++ b/plugins/volume_format_fs/volume_format_luks.cs
@@ -2,6 +2,8 @@
 
 <h3><?cs var:html_escape(Lang.Plugins.volume_format_fs.Title.Format) ?></h3>
 
+<?cs call:handle_messages() ?>
+
 <?cs if:Data.CurrentDisk.active ?>
 	<?cs call:hint("Plugins.volume_format_fs.UnmountBeforeInit") ?>
 <?cs else ?>
@@ -25,3 +27,5 @@
 
 <?cs /if ?>
 
+<?cs call:help_link("CryptoBoxUserConfiguration") ?>
+
diff --git a/plugins/volume_mount/volume_mount.cs b/plugins/volume_mount/volume_mount.cs
index fbd7301..b898ddf 100644
--- a/plugins/volume_mount/volume_mount.cs
+++ b/plugins/volume_mount/volume_mount.cs
@@ -1,5 +1,7 @@
 <h3><?cs var:html_escape(Lang.Plugins.volume_mount.Title.Mount) ?></h3>
 
+<?cs call:handle_messages() ?>
+
 <?cs call:print_form_header("mount", "volume_mount") ?><p>
 	<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
 	<?cs if:Data.CurrentDisk.encryption ?>
@@ -14,3 +16,5 @@
 	<button type="submit" tabindex="2"><?cs var:html_escape(Lang.Plugins.volume_mount.Button.Mount) ?></button>
 </p></form>
 
+<?cs call:help_link("CryptoBoxUserConfiguration") ?>
+
diff --git a/plugins/volume_mount/volume_umount.cs b/plugins/volume_mount/volume_umount.cs
index 31dbe6d..2a365ac 100644
--- a/plugins/volume_mount/volume_umount.cs
+++ b/plugins/volume_mount/volume_umount.cs
@@ -1,8 +1,12 @@
 <h3><?cs var:html_escape(Lang.Plugins.volume_mount.Title.Umount) ?></h3>
 
+<?cs call:handle_messages() ?>
+
 <?cs call:print_form_header("umount", "volume_mount") ?>
 	<p><input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
 	   <input type="hidden" name="action" value="umount" />
 	<button type="submit" tabindex="2"><?cs var:html_escape(Lang.Plugins.volume_mount.Button.Umount) ?></button></p>
 </form>
 
+<?cs call:help_link("CryptoBoxUserConfiguration") ?>
+
diff --git a/plugins/volume_props/volume_properties.cs b/plugins/volume_props/volume_properties.cs
index ef107f2..01c7ee8 100644
--- a/plugins/volume_props/volume_properties.cs
+++ b/plugins/volume_props/volume_properties.cs
@@ -2,6 +2,8 @@
 
 <h2><?cs var:html_escape(Lang.Plugins.volume_props.Title.Properties) ?></h2>
 
+<?cs call:handle_messages() ?>
+
 <?cs if:Data.Plugins.volume_props.includePlugins ?>
 	<?cs # we use 'evar', as we expect 'include' commands inside the variable ?>
 	<?cs evar:Data.Plugins.volume_props.includePlugins ?>
diff --git a/plugins/volume_rename/volume_rename.cs b/plugins/volume_rename/volume_rename.cs
index cbea4dc..edbe42d 100644
--- a/plugins/volume_rename/volume_rename.cs
+++ b/plugins/volume_rename/volume_rename.cs
@@ -2,6 +2,8 @@
 
 <h3><?cs var:html_escape(Lang.Plugins.volume_rename.Title.ChangeVolumeName) ?></h3>
 
+<?cs call:handle_messages() ?>
+
 <?cs if:Data.CurrentDisk.active ?>
 	<?cs call:hint("Plugins.volume_rename.NoRenameIfActive") ?>
 <?cs else ?>
@@ -14,3 +16,5 @@
 	</form></p>
 <?cs /if ?>
 
+<?cs call:help_link("CryptoBoxUserConfiguration") ?>
+