diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/CandidatePacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/CandidatePacketExtension.java
deleted file mode 100644
index a7faf52a8..000000000
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/CandidatePacketExtension.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package net.java.sip.communicator.impl.protocol.jabber.extensions;
-
-/**
- * @author Emil Ivov
- */
-public class CandidatePacketExtension extends AbstractPacketExtension
-{
-    /**
-     * The name of the "candidate" element.
-     */
-    public static final String ELEMENT_NAME = "candidate";
-
-    /**
-     * Creates a new {@link CandidatePacketExtension}
-     */
-    public CandidatePacketExtension()
-    {
-        super(null, ELEMENT_NAME);
-    }
-
-    /**
-     * Creates a new {@link CandidatePacketExtension} with the specified
-     * <tt>elementName</tt> so that this class would be usable as a
-     * <tt>RemoteCandidatePacketExtension</tt> parent.
-     *
-     * @param elementName the element name that this instance should be using.
-     */
-    protected CandidatePacketExtension(String elementName)
-    {
-        super(null, elementName);
-    }
-}
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/RemoteCandidatePacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/RemoteCandidatePacketExtension.java
deleted file mode 100644
index 9bd4a59e0..000000000
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/RemoteCandidatePacketExtension.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package net.java.sip.communicator.impl.protocol.jabber.extensions;
-
-/**
- * @author Emil Ivov
- */
-public class RemoteCandidatePacketExtension extends CandidatePacketExtension
-{
-    /**
-     * The name of the "candidate" element.
-     */
-    public static final String ELEMENT_NAME = "remote-candidate";
-
-    /**
-     * Creates a new {@link CandidatePacketExtension}
-     */
-    public RemoteCandidatePacketExtension()
-    {
-        super(ELEMENT_NAME);
-    }
-
-
-}
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/CandidatePacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/CandidatePacketExtension.java
new file mode 100644
index 000000000..f8a46fd4d
--- /dev/null
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/CandidatePacketExtension.java
@@ -0,0 +1,365 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.impl.protocol.jabber.extensions.jingle;
+
+import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
+
+/**
+ * @author Emil Ivov
+ */
+public class CandidatePacketExtension extends AbstractPacketExtension
+{
+    /**
+     * The name of the "candidate" element.
+     */
+    public static final String ELEMENT_NAME = "candidate";
+
+    /**
+     * The name of the "component" element.
+     */
+    public static final String COMPONENT_ATTR_NAME = "component";
+
+    /**
+     * The name of the "foundation" element.
+     */
+    public static final String FOUNDATION_ATTR_NAME = "foundation";
+
+    /**
+     * The name of the "generation" element.
+     */
+    public static final String GENERATION_ATTR_NAME = "generation";
+
+    /**
+     * The name of the "id" element.
+     */
+    public static final String ID_ATTR_NAME = "id";
+
+    /**
+     * The name of the "ip" element.
+     */
+    public static final String IP_ATTR_NAME = "ip";
+
+    /**
+     * The name of the "network" element.
+     */
+    public static final String NETWORK_ATTR_NAME = "network";
+
+    /**
+     * The name of the "port" element.
+     */
+    public static final String PORT_ATTR_NAME = "port";
+
+    /**
+     * The name of the "priority" element.
+     */
+    public static final String PRIORITY_ATTR_NAME = "priority";
+
+    /**
+     * The name of the "protocol" element.
+     */
+    public static final String PROTOCOL_ATTR_NAME = "protocol";
+
+    /**
+     * The name of the "rel-addr" element.
+     */
+    public static final String REL_ADDR_ATTR_NAME = "rel-addr";
+
+    /**
+     * The name of the "rel-port" element.
+     */
+    public static final String REL_PORT_ATTR_NAME = "rel-port";
+
+    /**
+     * The name of the "type" element.
+     */
+    public static final String TYPE_ATTR_NAME = "type";
+
+    /**
+     * Creates a new {@link CandidatePacketExtension}
+     */
+    public CandidatePacketExtension()
+    {
+        super(null, ELEMENT_NAME);
+    }
+
+    /**
+     * Creates a new {@link CandidatePacketExtension} with the specified
+     * <tt>elementName</tt> so that this class would be usable as a
+     * <tt>RemoteCandidatePacketExtension</tt> parent.
+     *
+     * @param elementName the element name that this instance should be using.
+     */
+    protected CandidatePacketExtension(String elementName)
+    {
+        super(null, elementName);
+    }
+
+    /**
+     * Sets a component ID as defined in ICE-CORE.
+     *
+     * @param component a component ID as defined in ICE-CORE.
+     */
+    public void setComponent(int component)
+    {
+        super.setAttribute(COMPONENT_ATTR_NAME, component);
+    }
+
+    /**
+     * Returns a component ID as defined in ICE-CORE.
+     *
+     * @return a component ID as defined in ICE-CORE.
+     */
+    public int getComponent()
+    {
+        return super.getAttributeAsInt(COMPONENT_ATTR_NAME);
+    }
+
+    /**
+     * Sets the candidate foundation as defined in ICE-CORE.
+     *
+     * @param foundation the candidate foundation as defined in ICE-CORE.
+     */
+    public void setFoundation(int foundation)
+    {
+        super.setAttribute(FOUNDATION_ATTR_NAME, foundation);
+    }
+
+    /**
+     * Returns the candidate foundation as defined in ICE-CORE.
+     *
+     * @return the candidate foundation as defined in ICE-CORE.
+     */
+    public int getFoundation()
+    {
+        return super.getAttributeAsInt(FOUNDATION_ATTR_NAME);
+    }
+
+    /**
+     * Sets this canditate's generation index. A generation is an index,
+     * starting at 0, that enables the parties to keep track of updates to the
+     * candidate throughout the life of the session. For details, see the ICE
+     * Restarts section of XEP-0176.
+     *
+     * @param generation this canditate's generation index.
+     */
+    public void setGeneration(int generation)
+    {
+        super.setAttribute(GENERATION_ATTR_NAME, generation);
+    }
+
+    /**
+     * Returns this canditate's generation. A generation is an index, starting at
+     * 0, that enables the parties to keep track of updates to the candidate
+     * throughout the life of the session. For details, see the ICE Restarts
+     * section of XEP-0176.
+     *
+     * @return this canditate's generation index.
+     */
+    public int getGeneration()
+    {
+        return super.getAttributeAsInt(GENERATION_ATTR_NAME);
+    }
+
+    /**
+     * Sets this candidates's unique identifier <tt>String</tt>.
+     *
+     * @param id this candidates's unique identifier <tt>String</tt>
+     */
+    public void setID(String id)
+    {
+        super.setAttribute(ID_ATTR_NAME, id);
+    }
+
+    /**
+     * Returns this candidates's unique identifier <tt>String</tt>.
+     *
+     * @return this candidates's unique identifier <tt>String</tt>
+     */
+    public String getID()
+    {
+        return super.getAttributeAsString(ID_ATTR_NAME);
+    }
+
+    /**
+     * Sets this candidate's Internet Protocol (IP) address; this can be either
+     * an IPv4 address or an IPv6 address.
+     *
+     * @param ip this candidate's IPv4 or IPv6 address.
+     */
+    public void setIP(String ip)
+    {
+        super.setAttribute(IP_ATTR_NAME, ip);
+    }
+
+    /**
+     * Returns this candidate's Internet Protocol (IP) address; this can be
+     * either an IPv4 address or an IPv6 address.
+     *
+     * @return this candidate's IPv4 or IPv6 address.
+     */
+    public String getIP()
+    {
+        return super.getAttributeAsString(IP_ATTR_NAME);
+    }
+
+    /**
+     * The network index indicating the interface that the candidate belongs to.
+     * The network ID is used for diagnostic purposes only in cases where the
+     * calling hardware has more than one Network Interface Card.
+     *
+     * @param network the network index indicating the interface that the
+     * candidate belongs to.
+     */
+    public void setNetwork(int network)
+    {
+        super.setAttribute(NETWORK_ATTR_NAME, network);
+    }
+
+    /**
+     * Returns the network index indicating the interface that the candidate
+     * belongs to. The network ID is used for diagnostic purposes only in cases
+     * where the calling hardware has more than one Network Interface Card.
+     *
+     * @return the network index indicating the interface that the candidate
+     * belongs to.
+     */
+    public int getNetwork()
+    {
+        return super.getAttributeAsInt(NETWORK_ATTR_NAME);
+    }
+
+    /**
+     * Sets this candidate's port number.
+     *
+     * @param port this candidate's port number.
+     */
+    public void setPort(int port)
+    {
+        super.setAttribute(PORT_ATTR_NAME, port);
+    }
+
+    /**
+     * Returns this candidate's port number.
+     *
+     * @return this candidate's port number.
+     */
+    public int getPort()
+    {
+        return super.getAttributeAsInt(PORT_ATTR_NAME);
+    }
+
+    /**
+     * This candidate's priority as defined in ICE's RFC 5245
+     *
+     * @param priority this candidate's priority
+     */
+    public void setPriority(long priority)
+    {
+        super.setAttribute(PRIORITY_ATTR_NAME, priority);
+    }
+
+    /**
+     * This candidate's priority as defined in ICE's RFC 5245
+     *
+     * @return this candidate's priority
+     */
+    public int getPriority()
+    {
+        return super.getAttributeAsInt(PRIORITY_ATTR_NAME);
+    }
+
+    /**
+     * Sets this candidate's transport protocol.
+     *
+     * @param protocol this candidate's transport protocol.
+     */
+    public void setProtocol(String protocol)
+    {
+        super.setAttribute(PROTOCOL_ATTR_NAME, protocol);
+    }
+
+    /**
+     * Sets this candidate's transport protocol.
+     *
+     * @return this candidate's transport protocol.
+     */
+    public String getProtocol()
+    {
+        return super.getAttributeAsString(PROTOCOL_ATTR_NAME);
+    }
+
+    /**
+     * Sets this candidate's related address as described by ICE's RFC 5245.
+     *
+     * @param relAddr this candidate's related address as described by ICE's
+     * RFC 5245.
+     */
+    public void setRelAddr(String relAddr)
+    {
+        super.setAttribute(REL_ADDR_ATTR_NAME, relAddr);
+    }
+
+    /**
+     * Returns this candidate's related address as described by ICE's RFC 5245.
+     *
+     * @return this candidate's related address as described by ICE's RFC 5245.
+     */
+    public String getRelAddr()
+    {
+        return super.getAttributeAsString(REL_ADDR_ATTR_NAME);
+    }
+
+    /**
+     * Sets this candidate's related port as described by ICE's RFC 5245.
+     *
+     * @param relPort this candidate's related port as described by ICE's
+     * RFC 5245.
+     */
+    public void setRelPort(int relPort)
+    {
+        super.setAttribute(REL_PORT_ATTR_NAME, relPort);
+    }
+
+    /**
+     * Returns this candidate's related port as described by ICE's RFC 5245.
+     *
+     * @return this candidate's related port as described by ICE's RFC 5245.
+     */
+    public int getRelPort()
+    {
+        return super.getAttributeAsInt(REL_PORT_ATTR_NAME);
+    }
+
+    /**
+     * Sets a Candidate Type as defined in ICE-CORE. The allowable values are
+     * "host" for host candidates, "prflx" for peer reflexive candidates,
+     * "relay" for relayed candidates, and "srflx" for server reflexive
+     * candidates. All allowable values are enumerated in the {@link
+     * CandidateType} enum.
+     *
+     * @param type this candidates' type as per ICE's RFC 5245.
+     */
+    public void setType(CandidateType type)
+    {
+        super.setAttribute(TYPE_ATTR_NAME, type.toString());
+    }
+
+    /**
+     * Returns a Candidate Type as defined in ICE-CORE. The allowable values are
+     * "host" for host candidates, "prflx" for peer reflexive candidates,
+     * "relay" for relayed candidates, and "srflx" for server reflexive
+     * candidates. All allowable values are enumerated in the {@link
+     * CandidateType} enum.
+     *
+     * @return this candidates' type as per ICE's RFC 5245.
+     */
+    public CandidateType getType()
+    {
+        return CandidateType.valueOf(getAttributeAsString(TYPE_ATTR_NAME));
+    }
+
+}
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/CandidateType.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/CandidateType.java
new file mode 100644
index 000000000..aa429c1c2
--- /dev/null
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/CandidateType.java
@@ -0,0 +1,52 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.impl.protocol.jabber.extensions.jingle;
+
+/**
+ * An enumeration containing allowed types for {@link
+ * CandidatePacketExtension}s.
+ *
+ * @author Emil Ivov
+ */
+public enum CandidateType
+{
+    /**
+     * Indicates that a candidate is a Host Candidate: <br/>
+     * A candidate obtained by binding to a specific port from an IP address
+     * on the host.  This includes IP addresses on physical interfaces and
+     * logical ones, such as ones obtained through Virtual Private Networks
+     * (VPNs) and Realm Specific IP.
+     */
+    host,
+
+    /**
+     * Indicates that a candidate is a Peer Reflexive Candidate:  <br/>
+     * A candidate whose IP address and port are a binding allocated by a NAT
+     * for an agent when it sent a STUN Binding request through the NAT to its
+     * peer.
+     */
+    prflx,
+
+
+    /**
+     * Indicates that a candidate is a Relayed Candidate:<br/>
+     * A candidate obtained by sending a TURN Allocate request from a host
+     * candidate to a TURN server. The relayed candidate is resident on the
+     * TURN server, and the TURN server relays packets back towards the agent.
+     */
+    relay,
+
+    /**
+     * Indicates that a candidate is a Server Reflexive Candidate:<br/>
+     * A candidate whose IP address and port are a binding allocated by a
+     * NAT for an agent when it sent a packet through the NAT to a server.
+     * Server reflexive candidates can be learned by STUN servers using the
+     * Binding request, or TURN servers, which provides both a relayed and
+     * server reflexive candidate.
+     */
+    srflx;
+}
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RemoteCandidatePacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RemoteCandidatePacketExtension.java
index 50e0e2e3d..d2a0be499 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RemoteCandidatePacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/jingle/RemoteCandidatePacketExtension.java
@@ -6,12 +6,22 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber.extensions.jingle;
 
-import net.java.sip.communicator.impl.protocol.jabber.extensions.*;
-
 /**
  * @author Emil Ivov
  */
-public class RemoteCandidatePacketExtension extends AbstractPacketExtension
+public class RemoteCandidatePacketExtension extends CandidatePacketExtension
 {
+    /**
+     * The name of the "candidate" element.
+     */
+    public static final String ELEMENT_NAME = "remote-candidate";
+
+    /**
+     * Creates a new {@link CandidatePacketExtension}
+     */
+    public RemoteCandidatePacketExtension()
+    {
+        super(ELEMENT_NAME);
+    }
 
 }