diff --git a/ChangeLog b/ChangeLog
index 0bbc3b940..dabb57e69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2008-04-07  Carsten Dominik  <dominik@science.uva.nl>
 
+	* lisp/org-mew.el: File added, moved here from contrib/lisp.
+
 	* lisp/org.el (org-iswitchb): New command.
 	(org-buffer-list): New function.
 
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 46d4e4ea4..81c142b23 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -3,6 +3,8 @@
 	* lisp/org-iswitchb.el: File removed, because the functionality is
 	now in org.el, in the core.
 
+	* lisp/org-mew.el: File moved into the core.
+
 2008-03-14  Carsten Dominik  <dominik@science.uva.nl>
 
 	* lisp/org-depend.el: Add `provide' for the module system.
diff --git a/contrib/README b/contrib/README
index db999b376..e564cf9d3 100644
--- a/contrib/README
+++ b/contrib/README
@@ -19,7 +19,6 @@ org-id.el 	     --- Global id's for identifying entries
 org-interactive-query.el --- Interactive modification of tags query
 org-mairix.el 	     --- Hook mairix search into Org for different MUAs
 org-man.el 	     --- Support for links to manpages in Org-mode
-org-mew.el           --- Support for links to messages in Mew
 org-panel.el 	     --- Simple routines for us with bad memory
 org-registry.el      --- a registry for Org links
 org2rem.el           --- Convert org appointments into reminders
diff --git a/contrib/lisp/org-mew.el b/lisp/org-mew.el
similarity index 100%
rename from contrib/lisp/org-mew.el
rename to lisp/org-mew.el
diff --git a/lisp/org.el b/lisp/org.el
index e20027ddb..56924a731 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -139,7 +139,7 @@ With prefix arg HERE, insert it at point."
   (when (featurep 'org)
     (org-load-modules-maybe 'force)))
 
-(defcustom org-modules '(org-bbdb org-bibtex org-gnus org-info org-infojs org-irc org-mhe org-rmail org-vm org-wl)
+(defcustom org-modules '(org-bbdb org-bibtex org-gnus org-info org-infojs org-irc org-mew org-mhe org-rmail org-vm org-wl)
   "Modules that should always be loaded together with org.el.
 If a description starts with <C>, the file is not part of emacs
 and loading it will require that you have downloaded and properly installed
@@ -162,6 +162,7 @@ to add the symbol `xyz', and the package must have a call to
 	(const :tag "   infojs:            Set up Sebastian Rose's JavaScript org-info.js" org-infojs)
 	(const :tag "   irc:               Links to IRC/ERC chat sessions" org-irc)
 	(const :tag "   mac-message:       Links to messages in Apple Mail" org-mac-message)
+	(const :tag "   mew                Links to Mew folders/messages" org-mew)
 	(const :tag "   mhe:               Links to MHE folders/messages" org-mhe)
 	(const :tag "   rmail:             Links to RMAIL folders/messages" org-rmail)
 	(const :tag "   vm:                Links to VM folders/messages" org-vm)
@@ -2657,6 +2658,9 @@ If it is less than 8, the level-1 face gets re-used for level N+1 etc."
 (declare-function cdlatex-tab "ext:cdlatex" ())
 (declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep))
 (defvar font-lock-unfontify-region-function)
+(declare-function iswitchb-mode "iswitchb" (&optional arg)) 
+(declare-function iswitchb-read-buffer (prompt &optional default require-match start matches-set))
+(defvar iswitchb-temp-buflist)
 (declare-function org-gnus-follow-link "org-gnus" (&optional group article))
 (declare-function org-agenda-skip "org-agenda" ())
 (declare-function org-format-agenda-item "org-agenda"
@@ -12606,8 +12610,7 @@ With two prefix arguments, restrict available buffers to agenda files.
 Due to some yet unresolved reason, global function
 `iswitchb-mode' needs to be active for this function to work."
   (interactive "P")
-  (eval-when-compile
-    (require 'iswitchb))
+  (require 'iswitchb)
   (let ((enabled iswitchb-mode) blist)
     (or enabled (iswitchb-mode 1))
     (setq blist (cond ((equal arg '(4)) (org-buffer-list 'files))
@@ -14177,6 +14180,16 @@ With optional NODE, go directly to that node."
 
 ;;; Generally useful functions
 
+(defun org-plist-delete (plist property)
+  "Delete PROPERTY from PLIST.
+This is in contrast to merely setting it to 0."
+  (let (p)
+    (while plist
+      (if (not (eq property (car plist)))
+	  (setq p (plist-put p (car plist) (nth 1 plist))))
+      (setq plist (cddr plist)))
+    p))
+
 (defun org-force-self-insert (N)
   "Needed to enforce self-insert under remapping."
   (interactive "p")
@@ -15183,12 +15196,3 @@ Still experimental, may disappear in the future."
 ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
 ;;; org.el ends here
 
-(defun org-plist-delete (plist property)
-  "Delete PROPERTY from PLIST.
-This is in contrast to merely setting it to 0."
-  (let (p)
-    (while plist
-      (if (not (eq property (car plist)))
-	  (setq p (plist-put p (car plist) (nth 1 plist))))
-      (setq plist (cddr plist)))
-    p))