diff --git a/dokuwiki/lib/plugins/blockquote/conf/default.php b/dokuwiki/lib/plugins/blockquote/conf/default.php
index c5b8ebec..cdb7857d 100755
--- a/dokuwiki/lib/plugins/blockquote/conf/default.php
+++ b/dokuwiki/lib/plugins/blockquote/conf/default.php
@@ -4,4 +4,4 @@
  *
  */
 
-$conf['addStyling'] = 0;
+$conf['addStyling'] = 1;
diff --git a/dokuwiki/lib/plugins/blockquote/plugin.info.txt b/dokuwiki/lib/plugins/blockquote/plugin.info.txt
index 6910064c..2bfb3053 100755
--- a/dokuwiki/lib/plugins/blockquote/plugin.info.txt
+++ b/dokuwiki/lib/plugins/blockquote/plugin.info.txt
@@ -1,7 +1,7 @@
 base   blockquote
 author Anika Henke (previous author: Gina Haeussge)
 email  anika@selfthinker.org
-date   2016-04-03
+date   2017-08-25
 name   Blockquote Plugin
 desc   Write quotations in a semantically correct way
 url    https://www.dokuwiki.org/plugin:blockquote
diff --git a/dokuwiki/lib/plugins/blockquote/style.css b/dokuwiki/lib/plugins/blockquote/style.css
index dcdb1b51..522a21b3 100755
--- a/dokuwiki/lib/plugins/blockquote/style.css
+++ b/dokuwiki/lib/plugins/blockquote/style.css
@@ -1,10 +1,15 @@
 
 /* blockquote */
 .dokuwiki blockquote.blockquote-plugin {
-    margin: 1em 3em 1em 3em;
     border: 1px dotted __border__;
     background: __background_alt__ url(images/blockquote.gif) no-repeat 0.3em 0.3em;
     padding: 1em;
+    /* prevent plugin to interfere with expanded ToC when there's one */
+    overflow: hidden;
+    /* Fix placement with the rule above (original margins were: 1em 3em 1em 3em */
+    margin: 1em auto 1em auto;
+    /* Get closer to initial design when there's enough space (ie. 3em left and right margins) */
+    max-width: 90%;
 }
 
 /* cite */
@@ -25,4 +30,6 @@
 .dokuwiki q.blockquote-plugin {
     border: 1px dotted __border__;
     background: __background_alt__;
+    /* CSS quotes property quotation mark entity numbers can be customized */
+    quotes: "\0022" "\0022" "\0027" "\0027";
 }