diff --git a/src/db.lisp b/src/db.lisp
index 398ed7b..559c0b3 100644
--- a/src/db.lisp
+++ b/src/db.lisp
@@ -1812,6 +1812,8 @@ row."
 
 (gen-access-message-row user-username               :acct)
 
+(gen-access-message-row avatar                      :avatar)
+
 (gen-access-message-row tag-got-new-message         :got-new-message-p)
 
 (gen-access-message-row conversation-folder         :folder)
diff --git a/src/package.lisp b/src/package.lisp
index 071b320..d5152a7 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -893,6 +893,7 @@
    :row-message-reblog-id
    :row-lockedp
    :row-user-username
+   :row-avatar
    :row-tag-got-new-message
    :row-conversation-folder
    :row-conversation-root-status-id
diff --git a/src/ui-goodies.lisp b/src/ui-goodies.lisp
index d738dd8..5868896 100644
--- a/src/ui-goodies.lisp
+++ b/src/ui-goodies.lisp
@@ -2379,5 +2379,5 @@ printed, on the main window."
   (when-let* ((selected-row (line-oriented-window:selected-row-fields *thread-window*))
               (username     (db:row-message-username selected-row))
               (account      (db:acct->user username))
-              (avatar-url   (db-utils:db-getf account :avatar)))
+              (avatar-url   (db:row-avatar account)))
     (open-attach-window:open-attachment avatar-url)))