(defun jabber-history-query (start-time end-time number direction jid-regexp history-file)
  "Return a list of vectors, one for each message matching the criteria.
START-TIME and END-TIME are floats as obtained from `float-time'.
Either or both may be nil, meaning no restriction.
NUMBER is the maximum number of messages to return, or t for
unlimited.
DIRECTION is either \"in\" or \"out\", or t for no limit on direction.
JID-REGEXP is a regexp which must match the JID.
HISTORY-FILE is the file in which to search.
...

bobry@bobry> diff -iEbwB /usr/share/emacs/site-lisp/jabber-history.el ./jabber-history.el
199a200
>                     (when (numberp number)
201c202
<                         (setq lines-collected t)))))))))
---
>                           (setq lines-collected t))))))))))

(setq jabber-muc-private-buffer-format 
    "*-jmuc-priv-%g-%n-*")

(defvar jabber-log-buffer-format "*-jl-%n-*")


(defun jabber-log-get-buffer (jid)
  "Returnes buffer name for a given jid."
  (format-spec
   jabber-log-buffer-format
   (list
    (cons ?n (jabber-jid-displayname jid))
    (cons ?j (jabber-jid-user jid))
    (cons ?r (or (jabber-jid-resource jid) "")))))

(defun jabber-log-show (jid)
  "Function creates a buffer, contaning history for a given jid."
  (interactive
   (list (jabber-read-jid-completing "Show history for:")))

  (let* ((jid-regexp (concat "^" (regexp-quote (jabber-jid-user jid)) "\\(/.*\\)?$"))
         (history-file (jabber-history-filename jid))
         (log-entries (jabber-history-query nil nil t t jid-regexp history-file)))

    (when log-entries
      (with-current-buffer (get-buffer-create (jabber-log-get-buffer jid))
        (make-local-variable 'jabber-buffer-connection)
        ;; FIXME: this won't work right, if there's more then one connection
        (setq jabber-buffer-connection (car jabber-connections))
        (mapcar 'jabber-log-insert-entry log-entries)
        (jabber-chat-buffer-fill-long-lines)
        (switch-to-buffer (current-buffer)))
      )))

(defun jabber-log-insert-entry (entry)
  "Function inserts formated history entry at point."
  (let* ((message-time (jabber-parse-time (aref entry 0)))
         (message-body (aref entry 4))
         (message-sender (aref entry 2))
         (/me-p (string= message-sender "me"))
         (jabber-chat-prompt-type
          (if /me-p
              'jabber-chat-prompt-local
            'jabber-chat-prompt-foreign))
         (jabber-chat-prompt-format
          (if /me-p
              jabber-chat-local-prompt-format
            jabber-chat-foreign-prompt-format))
         username, jid, resource, nickname)

    (if /me-p
        (let ((state-data (fsm-get-state-data jabber-buffer-connection)))
          (setq
           username (plist-get state-data :username)
           jid (concat username (plist-get state-data :server))
           resource (plist-get state-data :resource)
           nickname username))
      (setq
       username (jabber-jid-username message-sender)
       jid (jabber-jid-user message-sender)
       resource (jabber-jid-resource message-sender)
       nickname (jabber-jid-displayname message-sender)))

    (insert
     (jabber-propertize
      (format-spec jabber-chat-prompt-format
                   (list
                    (cons ?t (format-time-string jabber-chat-delayed-time-format message-time))
                    (cons ?n nickname)
                    (cons ?u username)
                    (cons ?r resource)
                    (cons ?j jid)))
      'face jabber-chat-prompt-type
      'help-echo
      (concat (format-time-string "On %Y-%m-%d %H:%M:%S" message-time) " from you"))
     message-body "\n")
    ))