diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d41712e0c..571223b42 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-02  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-mac-message.el (org-mac-message-get-link): Remove the
+	quotes.
+	(org-mac-message-get-link): Return the result.
+
 2009-04-01  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-refile-get-location): Add file name only if not
diff --git a/lisp/org-mac-message.el b/lisp/org-mac-message.el
index 4e1006269..fe99a6218 100644
--- a/lisp/org-mac-message.el
+++ b/lisp/org-mac-message.el
@@ -107,7 +107,10 @@ active mail in AppleMail and make a link out of it."
 	    "end repeat\n"
 	    "return theLinkList as string\n"
 	    "end tell")))
-	 (link-list (split-string as-link-list "\n"))
+	 (link-list
+	  (mapcar
+	   (lambda (x) (if (string-match "\\`\"\\(.*\\)\"\\'" x) (setq x (match-string 1 x))) x)
+	   (split-string as-link-list "[\r\n]+")))
 	 split-link
 	 URL
 	 description
@@ -126,7 +129,8 @@ active mail in AppleMail and make a link out of it."
     (with-temp-buffer      
       (while orglink-list
 	(insert (concat (pop orglink-list)) "\n"))
-      (kill-region (point-min) (point-max)))))
+      (kill-region (point-min) (point-max))
+      (current-kill 0))))
 
 (defun org-mac-create-flagged-mail ()
   "Create links to flagged messages in a Mail.app account and