diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py
index b1a73d9c..120cd129 100644
--- a/sleekxmpp/plugins/__init__.py
+++ b/sleekxmpp/plugins/__init__.py
@@ -11,9 +11,6 @@ from sleekxmpp.plugins.base import register_plugin, load_plugin
 
 
 __all__ = [
-    # Non-standard
-    'gmail',     # Gmail searching and notifications
-
     # XEPS
     'xep_0004',  # Data Forms
     'xep_0009',  # Jabber-RPC
diff --git a/sleekxmpp/plugins/gmail_notify.py b/sleekxmpp/plugins/gmail_notify.py
new file mode 100644
index 00000000..fc97a2ab
--- /dev/null
+++ b/sleekxmpp/plugins/gmail_notify.py
@@ -0,0 +1,149 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permission.
+"""
+
+import logging
+from . import base
+from .. xmlstream.handler.callback import Callback
+from .. xmlstream.matcher.xpath import MatchXPath
+from .. xmlstream.stanzabase import registerStanzaPlugin, ElementBase, ET, JID
+from .. stanza.iq import Iq
+
+
+log = logging.getLogger(__name__)
+
+
+class GmailQuery(ElementBase):
+    namespace = 'google:mail:notify'
+    name = 'query'
+    plugin_attrib = 'gmail'
+    interfaces = set(('newer-than-time', 'newer-than-tid', 'q', 'search'))
+
+    def getSearch(self):
+        return self['q']
+
+    def setSearch(self, search):
+        self['q'] = search
+
+    def delSearch(self):
+        del self['q']
+
+
+class MailBox(ElementBase):
+    namespace = 'google:mail:notify'
+    name = 'mailbox'
+    plugin_attrib = 'mailbox'
+    interfaces = set(('result-time', 'total-matched', 'total-estimate',
+                      'url', 'threads', 'matched', 'estimate'))
+
+    def getThreads(self):
+        threads = []
+        for threadXML in self.xml.findall('{%s}%s' % (MailThread.namespace,
+                                                      MailThread.name)):
+            threads.append(MailThread(xml=threadXML, parent=None))
+        return threads
+
+    def getMatched(self):
+        return self['total-matched']
+
+    def getEstimate(self):
+        return self['total-estimate'] == '1'
+
+
+class MailThread(ElementBase):
+    namespace = 'google:mail:notify'
+    name = 'mail-thread-info'
+    plugin_attrib = 'thread'
+    interfaces = set(('tid', 'participation', 'messages', 'date',
+                      'senders', 'url', 'labels', 'subject', 'snippet'))
+    sub_interfaces = set(('labels', 'subject', 'snippet'))
+
+    def getSenders(self):
+        senders = []
+        sendersXML = self.xml.find('{%s}senders' % self.namespace)
+        if sendersXML is not None:
+            for senderXML in sendersXML.findall('{%s}sender' % self.namespace):
+                senders.append(MailSender(xml=senderXML, parent=None))
+        return senders
+
+
+class MailSender(ElementBase):
+    namespace = 'google:mail:notify'
+    name = 'sender'
+    plugin_attrib = 'sender'
+    interfaces = set(('address', 'name', 'originator', 'unread'))
+
+    def getOriginator(self):
+        return self.xml.attrib.get('originator', '0') == '1'
+
+    def getUnread(self):
+        return self.xml.attrib.get('unread', '0') == '1'
+
+
+class NewMail(ElementBase):
+    namespace = 'google:mail:notify'
+    name = 'new-mail'
+    plugin_attrib = 'new-mail'
+
+
+class gmail_notify(base.base_plugin):
+    """
+    Google Talk: Gmail Notifications
+    """
+
+    def plugin_init(self):
+        self.description = 'Google Talk: Gmail Notifications'
+
+        self.xmpp.registerHandler(
+            Callback('Gmail Result',
+                     MatchXPath('{%s}iq/{%s}%s' % (self.xmpp.default_ns,
+                                                   MailBox.namespace,
+                                                   MailBox.name)),
+                     self.handle_gmail))
+
+        self.xmpp.registerHandler(
+            Callback('Gmail New Mail',
+                     MatchXPath('{%s}iq/{%s}%s' % (self.xmpp.default_ns,
+                                                   NewMail.namespace,
+                                                   NewMail.name)),
+                     self.handle_new_mail))
+
+        registerStanzaPlugin(Iq, GmailQuery)
+        registerStanzaPlugin(Iq, MailBox)
+        registerStanzaPlugin(Iq, NewMail)
+
+        self.last_result_time = None
+
+    def handle_gmail(self, iq):
+        mailbox = iq['mailbox']
+        approx = ' approximately' if mailbox['estimated'] else ''
+        log.info('Gmail: Received%s %s emails', approx, mailbox['total-matched'])
+        self.last_result_time = mailbox['result-time']
+        self.xmpp.event('gmail_messages', iq)
+
+    def handle_new_mail(self, iq):
+        log.info("Gmail: New emails received!")
+        self.xmpp.event('gmail_notify')
+        self.checkEmail()
+
+    def getEmail(self, query=None):
+        return self.search(query)
+
+    def checkEmail(self):
+        return self.search(newer=self.last_result_time)
+
+    def search(self, query=None, newer=None):
+        if query is None:
+            log.info("Gmail: Checking for new emails")
+        else:
+            log.info('Gmail: Searching for emails matching: "%s"', query)
+        iq = self.xmpp.Iq()
+        iq['type'] = 'get'
+        iq['to'] = self.xmpp.boundjid.bare
+        iq['gmail']['q'] = query
+        iq['gmail']['newer-than-time'] = newer
+        return iq.send()
diff --git a/sleekxmpp/plugins/xep_0030/stanza/info.py b/sleekxmpp/plugins/xep_0030/stanza/info.py
index 2dec5d88..25d1d07f 100644
--- a/sleekxmpp/plugins/xep_0030/stanza/info.py
+++ b/sleekxmpp/plugins/xep_0030/stanza/info.py
@@ -165,7 +165,7 @@ class DiscoInfo(ElementBase):
             identities = []
         for id_xml in self.findall('{%s}identity' % self.namespace):
             xml_lang = id_xml.attrib.get('{%s}lang' % self.xml_ns, None)
-            if lang is None or lang == '*' or xml_lang == lang:
+            if lang is None or xml_lang == lang:
                 id = (id_xml.attrib['category'],
                       id_xml.attrib['type'],
                       id_xml.attrib.get('{%s}lang' % self.xml_ns, None),
diff --git a/sleekxmpp/plugins/xep_0071/stanza.py b/sleekxmpp/plugins/xep_0071/stanza.py
index 77957541..a5cedda3 100644
--- a/sleekxmpp/plugins/xep_0071/stanza.py
+++ b/sleekxmpp/plugins/xep_0071/stanza.py
@@ -26,13 +26,20 @@ class XHTML_IM(ElementBase):
         if lang is None:
             lang = self.get_lang()
         self.del_body(lang)
-        content = str(content)
-        header = '<body xmlns="%s"' % XHTML_NS
-        if lang:
-            header = '%s xml:lang="%s"' % (header, lang)
-        content = '%s>%s</body>' % (header, content)
-        xhtml = ET.fromstring(content)
-        self.xml.append(xhtml)
+        if lang == '*':
+            for sublang, subcontent in content.items():
+                self.set_body(subcontent, sublang)
+        else:
+            if isinstance(content, type(ET.Element('test'))):
+                content = ET.tostring(content)
+            else:
+                content = str(content)
+            header = '<body xmlns="%s"' % XHTML_NS
+            if lang:
+                header = '%s xml:lang="%s"' % (header, lang)
+            content = '%s>%s</body>' % (header, content)
+            xhtml = ET.fromstring(content)
+            self.xml.append(xhtml)
 
     def get_body(self, lang=None):
         """Return the contents of the HTML body."""
diff --git a/sleekxmpp/xmlstream/tostring.py b/sleekxmpp/xmlstream/tostring.py
index f4157f7a..c49abd3e 100644
--- a/sleekxmpp/xmlstream/tostring.py
+++ b/sleekxmpp/xmlstream/tostring.py
@@ -92,7 +92,9 @@ def tostring(xml=None, xmlns='', stream=None, outbuffer='',
         else:
             attrib_ns = attrib.split('}')[0][1:]
             attrib = attrib.split('}')[1]
-            if stream and attrib_ns in stream.namespace_map:
+            if attrib_ns == XML_NS:
+                output.append(' xml:%s="%s"' % (attrib, value))
+            elif stream and attrib_ns in stream.namespace_map:
                 mapped_ns = stream.namespace_map[attrib_ns]
                 if mapped_ns:
                     if namespaces is None:
@@ -104,8 +106,6 @@ def tostring(xml=None, xmlns='', stream=None, outbuffer='',
                             mapped_ns, attrib_ns))
                     output.append(' %s:%s="%s"' % (
                         mapped_ns, attrib, value))
-            elif attrib_ns == XML_NS:
-                output.append(' xml:%s="%s"' % (attrib, value))
 
     if open_only:
         # Only output the opening tag, regardless of content.
diff --git a/tests/test_stanza_message.py b/tests/test_stanza_message.py
index e55971df..3ed965b6 100644
--- a/tests/test_stanza_message.py
+++ b/tests/test_stanza_message.py
@@ -30,9 +30,7 @@ class TestMessageStanzas(SleekTest):
         msg['to'] = "fritzy@netflint.net/sleekxmpp"
         msg['body'] = "this is the plaintext message"
         msg['type'] = 'chat'
-        p = ET.Element('{http://www.w3.org/1999/xhtml}p')
-        p.text = "This is the htmlim message"
-        msg['html']['body'] = p
+        msg['html']['body'] = '<p>This is the htmlim message</p>'
         self.check(msg, """
           <message to="fritzy@netflint.net/sleekxmpp" type="chat">
             <body>this is the plaintext message</body>