diff --git a/source/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java b/source/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
index 7b06af301..ff151ed34 100644
--- a/source/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
+++ b/source/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
@@ -61,6 +61,7 @@ public class ItemProvider implements PacketExtensionProvider
                     if (tag == XmlPullParser.END_TAG && parser.getName().equals(elem)) 
                     {
                         done = true;
+                        continue;
                     }
                     else if (parser.getEventType() == XmlPullParser.START_TAG) 
                     {
@@ -87,9 +88,13 @@ public class ItemProvider implements PacketExtensionProvider
                     else if (parser.getEventType() == XmlPullParser.END_TAG) 
                     {
                         if (isEmptyElement) 
+                        {
                             isEmptyElement = false;
+                        }
                         else 
+                        {
                             payloadText.append("</").append(parser.getName()).append(">");
+                        }
                     }
                     else if (parser.getEventType() == XmlPullParser.TEXT) 
                     {
@@ -99,9 +104,9 @@ public class ItemProvider implements PacketExtensionProvider
                 }
                 return new PayloadItem<SimplePayload>(id, node, new SimplePayload(payloadElemName, payloadNS, payloadText.toString()));
             }
-            else {
-                return new PayloadItem<PacketExtension>(id, node, PacketParserUtils.parsePacketExtension(
-                        payloadElemName, payloadNS, parser));
+            else 
+            {
+                return new PayloadItem<PacketExtension>(id, node, PacketParserUtils.parsePacketExtension(payloadElemName, payloadNS, parser));
             }
         }
     }
diff --git a/source/org/jivesoftware/smackx/pubsub/provider/ItemsProvider.java b/source/org/jivesoftware/smackx/pubsub/provider/ItemsProvider.java
index 01cb9d4b2..6f66b6de0 100644
--- a/source/org/jivesoftware/smackx/pubsub/provider/ItemsProvider.java
+++ b/source/org/jivesoftware/smackx/pubsub/provider/ItemsProvider.java
@@ -17,7 +17,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.jivesoftware.smack.packet.PacketExtension;
-import org.jivesoftware.smackx.provider.EmbeddedExtensionProvider;
+import org.jivesoftware.smack.provider.EmbeddedExtensionProvider;
 import org.jivesoftware.smackx.pubsub.ItemsExtension;
 
 /**