diff --git a/config.el b/config.el
index b83bb1c..0265e33 100644
--- a/config.el
+++ b/config.el
@@ -649,16 +649,17 @@ and optional priority indicator [#A]."
           ("/personal/Archive" . ?a)))
   ;; Cursor on subject column after j/k navigation
   (defun my/mu4e-goto-subject (&rest _)
-    "Move cursor to the subject column in mu4e headers."
+    "Move cursor to the subject column in mu4e headers.
+Accounts for mu4e's 1-char mark indicator at the start of each line."
     (when (derived-mode-p 'mu4e-headers-mode)
       (beginning-of-line)
-      (let ((offset 0))
+      (let ((offset 1)) ; 1 = mu4e mark indicator (space or *)
         (catch 'found
           (dolist (field mu4e-headers-fields)
             (if (eq (car field) :subject)
                 (throw 'found nil)
               (setq offset (+ offset (or (cdr field) 0) 1)))))
-        (forward-char offset))))
+        (forward-char (min offset (- (line-end-position) (point)))))))
   (advice-add 'mu4e-headers-next :after #'my/mu4e-goto-subject)
   (advice-add 'mu4e-headers-prev :after #'my/mu4e-goto-subject))