diff -r 5924f2bd0b18 data/TWiki/TagMePlugin.txt
--- a/data/TWiki/TagMePlugin.txt	Fri Aug 22 12:00:24 2008 +0200
+++ b/data/TWiki/TagMePlugin.txt	Fri Aug 22 12:33:40 2008 +0200
@@ -126,7 +126,9 @@ The Plugin handles a =%<nop>TAGME{}%= va
 	  | =minsize="90"= | Minimum size of tag =$size= (typically percent font size) | ="90"= |
 	  | =maxsize="180"= | Maximum size of tag =$size= | ="180"= |
 	  | =format="..."= | Format of a tag, tokens =$tag=, =$size=, =$marker= (adds selected="selected" for use in html options), =$count=, =$order= | ="$tag"= |
+	  | =prefix="..."= | Printed before the list of tags if it is not empty, =$n= can be used for newlines. e.g: =prefix="Tags: &lt;i&gt;"= | =""= |
 	  | =separator=", "= | Separator between tags | =", "=, unless =format= has been specified |
+	  | =suffix="..."= | Printed after the list of tags if it is not empty, =$n= can be used for newlines. e.g: =suffix="&lt;/i&gt;"= | =""= |
 
 	* =%<nop>TAGME{ tpaction="query" ... }%= - tag search
 	  | *Parameter* | *Comment* | *Default* |
diff -r 5924f2bd0b18 lib/TWiki/Plugins/TagMePlugin.pm
--- a/lib/TWiki/Plugins/TagMePlugin.pm	Fri Aug 22 12:00:24 2008 +0200
+++ b/lib/TWiki/Plugins/TagMePlugin.pm	Fri Aug 22 12:33:40 2008 +0200
@@ -356,7 +356,9 @@ sub _showAllTags {
     my $exclude   = TWiki::Func::extractNameValuePair( $attr, 'exclude' );
     my $by        = TWiki::Func::extractNameValuePair( $attr, 'by' );
     my $format    = TWiki::Func::extractNameValuePair( $attr, 'format' );
+    my $prefix    = TWiki::Func::extractNameValuePair( $attr, 'prefix' );
     my $separator = TWiki::Func::extractNameValuePair( $attr, 'separator' );
+    my $suffix    = TWiki::Func::extractNameValuePair( $attr, 'suffix' );
     my $minSize   = TWiki::Func::extractNameValuePair( $attr, 'minsize' );
     my $maxSize   = TWiki::Func::extractNameValuePair( $attr, 'maxsize' );
     my $minCount  = TWiki::Func::extractNameValuePair( $attr, 'mincount' );
@@ -508,7 +510,7 @@ sub _showAllTags {
               } @tags
         );
     }
-    return $text;
+    return $text ? $prefix.$text.$suffix : $text;
 }
 
 # =========================