- (setq cache-file (elmo-file-cache-get
- (elmo-msgdb-overview-entity-get-id entity)))
- (setq use-cache (eq (elmo-file-cache-status cache-file) 'entire))
+ (when entity
+ (setq cache-file (elmo-file-cache-get
+ (elmo-message-entity-field entity 'message-id)))
+ (setq use-cache (and (elmo-message-use-cache-p folder number)
+ (eq (elmo-file-cache-status cache-file) 'entire))))