Index: src/main/java/org/xwiki/eclipse/ui/editors/contentassist/strategies/XWikiMarkupAutoEditStrategy.java
===================================================================
--- src/main/java/org/xwiki/eclipse/ui/editors/contentassist/strategies/XWikiMarkupAutoEditStrategy.java	(revision 21353)
+++ src/main/java/org/xwiki/eclipse/ui/editors/contentassist/strategies/XWikiMarkupAutoEditStrategy.java	(working copy)
@@ -121,17 +121,26 @@
         try {
             int startOffset = endOffset;
             int character;
-
+            int lastSpaceOffset  = -1;
             while (startOffset >= 0) {
                 character = document.getChar(startOffset);
+                if(character == ' ') {
+                	lastSpaceOffset = startOffset;
+                }
                 if (character == '\n') {
                     return null;
                 }
 
                 if (character == openingChar) {
-                    return document.get(startOffset, endOffset - startOffset + 1);
+                	int length;
+                	if(lastSpaceOffset > 0) {
+                		length = lastSpaceOffset - startOffset;
+                	} else {
+                		length = endOffset - startOffset + 1;
+                	}
+                    return document.get(startOffset, length);
                 }
-
+                
                 startOffset--;
             }
         } catch (BadLocationException e) {