                      (olm-mail-item-entry-id-at))))
     (with-current-buffer mbuf
       (setq-local buffer-file-coding-system 'utf-8-dos))
-    (olm-do-command (concat "Olm.message '" entry-id "'") mbuf)
+    (olm-do-command (format "Olm.message %S" entry-id) mbuf)
     (with-current-buffer mbuf
       (olm-message-mode)
       (goto-char (point-min)))

(defun olm-summary-mark-message-as-read
  ()
  (interactive)
  (olm-do-command (concat "Olm.mark_as_read '"
                          (olm-mail-item-entry-id-at)
                          "'")))

(defun olm-summary-scroll-message-forward
  ()

  ()
  (interactive)
  (let ((n (line-number-at-pos)))
    (olm-do-command (format "Olm.toggle_task_flag" (olm-mail-item-entry-id-at)))
    (olm-scan)
    (goto-line n)))

