diff --git a/lisp/org-html.el b/lisp/org-html.el
index 28a0e8fec..fde563bc0 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -33,7 +33,7 @@
 
 (declare-function org-id-find-id-file "org-id" (id))
 (declare-function htmlize-region "ext:htmlize" (beg end))
-(declare-function org-pop-to-buffer-same-window 
+(declare-function org-pop-to-buffer-same-window
 		  "org-compat" (&optional buffer-or-name norecord label))
 
 (defgroup org-export-html nil
@@ -906,7 +906,7 @@ OPT-PLIST is the export options list."
 			 (string-match "^\\.\\.?/" path)))
 		   "file")
 		  (t "internal")))
-      (setq path (org-extract-attributes (org-link-unescape path)))
+      (setq path (org-extract-attributes path))
       (setq attr (get-text-property 0 'org-attributes path))
       (setq desc1 (if (match-end 5) (match-string 5 line))
 	    desc2 (if (match-end 2) (concat type ":" path) path)
@@ -919,7 +919,7 @@ OPT-PLIST is the export options list."
 	  (if (string-match "^file:" desc)
 	      (setq desc (substring desc (match-end 0)))))
 	(setq desc (org-add-props
-		       (concat "<img src=\"" desc "\" alt=\"" 
+		       (concat "<img src=\"" desc "\" alt=\""
 			       (file-name-nondirectory desc) "\"/>")
 		       '(org-protected t))))
       (cond
@@ -1356,9 +1356,9 @@ lang=\"%s\" xml:lang=\"%s\">
 	    (insert "\n</div>\n")))
 
 	;; begin wrap around body
-	(insert (format "\n<div id=\"%s\">" 
+	(insert (format "\n<div id=\"%s\">"
 			;; FIXME org-export-html-content-div is obsolete since 7.7
-			(or org-export-html-content-div 
+			(or org-export-html-content-div
 			    (nth 1 org-export-html-divs)))
 		;; FIXME this should go in the preamble but is here so
 		;; that org-infojs can still find it
@@ -1375,7 +1375,7 @@ lang=\"%s\" xml:lang=\"%s\">
 	    (push "<div id=\"text-table-of-contents\">\n" thetoc)
 	    (push "<ul>\n<li>" thetoc)
 	    (setq lines
-		  (mapcar 
+		  (mapcar
 		   #'(lambda (line)
 		       (if (and (string-match org-todo-line-regexp line)
 				(not (get-text-property 0 'org-protected line)))
@@ -1401,7 +1401,7 @@ lang=\"%s\" xml:lang=\"%s\">
 					     line lines level))))
 			     (if (string-match
 				  (org-re "[ \t]+:\\([[:alnum:]_@:]+\\):[ \t]*$") txt)
-				 (setq txt (replace-match  
+				 (setq txt (replace-match
 					    "&nbsp;&nbsp;&nbsp;<span class=\"tag\"> \\1</span>" t nil txt)))
 			     (if (string-match quote-re0 txt)
 				 (setq txt (replace-match "" t t txt)))
@@ -1429,7 +1429,7 @@ lang=\"%s\" xml:lang=\"%s\">
 				   ;; Check for targets
 				   (while (string-match org-any-target-regexp line)
 				     (setq line (replace-match
-						 (concat "@<span class=\"target\">" 
+						 (concat "@<span class=\"target\">"
 							 (match-string 1 line) "@</span> ")
 						 t t line)))
 				   (while (string-match "&lt;\\(&lt;\\)+\\|&gt;\\(&gt;\\)+" txt)
@@ -1437,8 +1437,8 @@ lang=\"%s\" xml:lang=\"%s\">
 				   (setq href
 					 (replace-regexp-in-string
 					  "\\." "-" (format "sec-%s" snumber)))
-				   (setq href (org-solidify-link-text 
-					       (or (cdr (assoc href 
+				   (setq href (org-solidify-link-text
+					       (or (cdr (assoc href
 							       org-export-preferred-target-alist)) href)))
 				   (push
 				    (format
@@ -1446,7 +1446,7 @@ lang=\"%s\" xml:lang=\"%s\">
 					 "</li>\n<li><a href=\"#%s\"><span class=\"todo\">%s</span></a>"
 				       "</li>\n<li><a href=\"#%s\">%s</a>")
 				     href txt) thetoc)
-				   
+
 				   (setq org-last-level level)))))
 		       line)
 		   lines))
@@ -1455,15 +1455,15 @@ lang=\"%s\" xml:lang=\"%s\">
 	      (push "</li>\n</ul>\n" thetoc))
 	    (push "</div>\n" thetoc)
 	    (setq thetoc (if have-headings (nreverse thetoc) nil))))
-      
+
       (setq head-count 0)
       (org-init-section-numbers)
-      
+
       (org-open-par)
-      
+
       (while (setq line (pop lines) origline line)
 	(catch 'nextline
-	  
+
 	  ;; end of quote section?
 	  (when (and inquote (string-match org-outline-regexp-bol line))
 	    (insert "</pre>\n")
@@ -1818,7 +1818,7 @@ lang=\"%s\" xml:lang=\"%s\">
 			      (?d . ,date)   (?c . ,creator-info)
 			      (?v . ,html-validation-link))))))
 	    (insert "\n</div>"))))
-      
+
       ;; FIXME `org-export-html-with-timestamp' has been declared
       ;; obsolete since Org 7.7 -- don't forget to remove this.
       (if org-export-html-with-timestamp
@@ -1951,7 +1951,7 @@ NO-CSS is passed to the exporter."
   (if (string-match "^[ \t]*|" (car lines))
       ;; A normal org table
       (org-format-org-table-html lines nil no-css)
-    ;; Table made by table.el 
+    ;; Table made by table.el
     (or (org-format-table-table-html-using-table-generate-source
 	 olines (not org-export-prefer-native-exporter-for-tables))
 	;; We are here only when table.el table has NO col or row