diff --git a/markdown-mode.el b/markdown-mode.el
index 6a94a477..773a341c 100644
--- a/markdown-mode.el
+++ b/markdown-mode.el
@@ -1368,6 +1368,12 @@ This is an exact copy of `line-number-at-pos' for use in emacs21."
       (forward-line 0)
       (1+ (count-lines start (point))))))
 
+(defun markdown-nobreak-p ()
+  "Returns nil if it is ok for fill-paragraph to insert a line
+  break at point"
+  ;; are we inside in square brackets
+  (looking-back "\\[[^]]*"))
+
 
 
 ;;; Mode definition  ==========================================================
@@ -1407,6 +1413,14 @@ This is an exact copy of `line-number-at-pos' for use in emacs21."
 
 ;(add-to-list 'auto-mode-alist '("\\.text$" . markdown-mode))
 
+
+(add-hook 'markdown-mode-hook
+	  (lambda ()
+	    (make-local-variable 'fill-nobreak-predicate)
+	    (add-hook 'fill-nobreak-predicate 'markdown-nobreak-p)))
+
+
+
 (provide 'markdown-mode)
 
 ;;; markdown-mode.el ends here