diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
index 4cfec7419..d15d7b6cb 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
@@ -1436,6 +1436,7 @@ public MoveMetaContactThread(   MetaContact srcContact,
             this.destGroup = destGroup;
         }
 
+        @SuppressWarnings("fallthrough")
         public void run()
         {
             if (!ConfigurationManager.isMoveContactConfirmationRequested())
diff --git a/src/net/java/sip/communicator/impl/gui/utils/ExtendedTooltip.java b/src/net/java/sip/communicator/impl/gui/utils/ExtendedTooltip.java
index 294d53265..cac9417d7 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/ExtendedTooltip.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/ExtendedTooltip.java
@@ -15,13 +15,13 @@
 
 /**
  * The tooltip shown over a contact in the contact list.
- * 
+ *
  * @author Yana Stamcheva
  */
 public class ExtendedTooltip
     extends JToolTip
 {
-    private static final int textRowHeight = 25;
+    private static final int textRowHeight = 15;
 
     private final JLabel imageLabel = new JLabel();
 
@@ -73,12 +73,12 @@ public ExtendedTooltip(boolean isListViewEnabled)
             mainPanel.add(titleLabel, BorderLayout.NORTH);
         }
 
-        this.add(mainPanel); 
+        this.add(mainPanel);
     }
 
     /**
      * Sets the given image to this tooltip.
-     * 
+     *
      * @param imageIcon The image icon to set.
      */
     public void setImage(ImageIcon imageIcon)
@@ -89,7 +89,7 @@ public void setImage(ImageIcon imageIcon)
     /**
      * Sets the title of the tooltip. The text would be shown in bold on the top
      * of the tooltip panel.
-     * 
+     *
      * @param titleText The title of the tooltip.
      */
     public void setTitle(String titleText)
@@ -107,7 +107,7 @@ public void setTitle(String titleText)
     /**
      * Adds an icon-string list, which would appear on the right of the image
      * panel.
-     * 
+     *
      * @param icon the icon to show
      * @param text the name to show
      */
diff --git a/src/net/java/sip/communicator/service/neomedia/MediaService.java b/src/net/java/sip/communicator/service/neomedia/MediaService.java
index 701a6eb99..b1e2a8e63 100644
--- a/src/net/java/sip/communicator/service/neomedia/MediaService.java
+++ b/src/net/java/sip/communicator/service/neomedia/MediaService.java
@@ -42,5 +42,13 @@ public interface MediaService
      */
     public List<MediaDevice> getDevices(MediaType mediaType);
 
+    /**
+     * Creates a <tt>MediaStream</tt> that will be using the specified
+     * <tt>MediaDevice</tt> for both capture and playback of media exchanged
+     *
+     * @return
+     */
+    public MediaStream createMediaStream();
+
 
 }
diff --git a/src/net/java/sip/communicator/service/neomedia/MediaStream.java b/src/net/java/sip/communicator/service/neomedia/MediaStream.java
index 11b6ec094..dfb3f87a0 100644
--- a/src/net/java/sip/communicator/service/neomedia/MediaStream.java
+++ b/src/net/java/sip/communicator/service/neomedia/MediaStream.java
@@ -14,8 +14,6 @@
  * <p>
  *
  * @author Emil Ivov
- * @author Lubomir Marinov
- * @author Emanuel Onica
  */
 public interface MediaStream
 {