diff --git a/src/MiscCommands.py b/src/MiscCommands.py
index 3d39dc2fa..51f9eb65c 100755
--- a/src/MiscCommands.py
+++ b/src/MiscCommands.py
@@ -165,6 +165,8 @@ class MiscCommands(callbacks.Privmsg):
         messages = pprint.pformat(irc.state.history[-10:])
         email = textwrap.dedent("""
         Subject: %s
+        From: jemfinch@users.sourceforge.net
+        To: supybot-bugs@lists.sourceforge.net
         Date: %s
 
         Bug report for Supybot %s.
@@ -247,10 +249,12 @@ class MiscCommands(callbacks.Privmsg):
         userHostmask = msg.prefix.split('!', 1)[1]
         if nick:
             try:
-                hostmask = irc.state.nickToHostmask(nick)
-                otherUserHostmask = hostmask.split('!', 1)[1]
-                L = self._mores[otherUserHostmask][:]
-                self._mores[userHostmask] = L
+                (public, L) = self._mores[nick]
+                if public:
+                    self._mores[userHostmask] = L[:]
+                else:
+                    irc.error(msg, '%s has no public mores.' % nick)
+                    return
             except KeyError:
                 irc.error(msg, 'Sorry, I can\'t find a hostmask for %s' % nick)
                 return
diff --git a/src/callbacks.py b/src/callbacks.py
index 2da76dc15..452d0af7b 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -385,6 +385,7 @@ class IrcObjectProxy:
                                 utils.nItems(len(msgs), 'message', 'more')
                 mask = msg.prefix.split('!', 1)[1]
                 Privmsg._mores[mask] = msgs
+                Privmsg._mores[msg.nick]=(ircutils.isChannel(msg.args[0]),msgs)
                 self.irc.queueMsg(reply(msg, response, self.prefixName))
         else:
             self.args[self.counter] = s