diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java
index cb8c29cab4..07c79ce389 100644
--- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java
+++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java
@@ -34,12 +34,13 @@
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HasValue;
 import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.VerticalPanel;
 
 public class SourcePanel extends Composite implements HasValue<TransUnit>, HasClickHandlers
 {
 
    private final FlowPanel panel;
-   private final HighlightingLabel sourceLabel;
+   private final VerticalPanel sourceLabels;
    private TransUnit value;
 
    public SourcePanel(TransUnit value, TableResources resources, NavigationMessages messages)
@@ -51,16 +52,29 @@ public SourcePanel(TransUnit value, TableResources resources, NavigationMessages
       initWidget(panel);
       setStylePrimaryName("TableEditorSource");
 
-      sourceLabel = new HighlightingLabel(value.getSource());
+      sourceLabels = new VerticalPanel();
+      sourceLabels.setSize("100%", "100%");
+
+      // for (String source : value.getSources)
+      // {
+      // HighlightingLabel sourceLabel = new HighlightingLabel(source);
+      // sourceLabel.setStylePrimaryName("TableEditorContent");
+      // sourceLabel.setTitle(messages.sourceCommentLabel() +
+      // value.getSourceComment());
+      // sourceLabels.add(sourceLabel);
+      // }
+
+      HighlightingLabel sourceLabel = new HighlightingLabel(value.getSource());
       sourceLabel.setStylePrimaryName("TableEditorContent");
       sourceLabel.setTitle(messages.sourceCommentLabel() + value.getSourceComment());
 
-      panel.add(sourceLabel);
+      sourceLabels.add(sourceLabel);
+      panel.add(sourceLabels);
    }
 
-   public Label getLabel()
+   public VerticalPanel getLabels()
    {
-      return sourceLabel;
+      return sourceLabels;
    }
 
    @Override
@@ -102,7 +116,10 @@ public HandlerRegistration addClickHandler(ClickHandler handler)
    
    public void highlightSearch(String search)
    {
-      sourceLabel.highlightSearch(search);
+      for (int i = 0; i < sourceLabels.getWidgetCount(); i++)
+      {
+         HighlightingLabel sourceLabel = (HighlightingLabel) sourceLabels.getWidget(i);
+         sourceLabel.highlightSearch(search);
+      }
    }
-
 }
diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
index 0074d45f82..1ccb6324f5 100644
--- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
+++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
@@ -131,18 +131,18 @@ public void renderRowValue(final TransUnit rowValue, ColumnDefinition<TransUnit,
          {
             sourcePanel.highlightSearch(findMessage);
          }
-         sourcePanel.getLabel().sinkEvents(Event.ONCLICK);
-         sourcePanel.getLabel().addClickHandler(new ClickHandler()
-         {
-            @Override
-            public void onClick(ClickEvent event)
-            {
-               if (targetCellEditor.isOpened())
-               {
-                  targetCellEditor.savePendingChange(true);
-               }
-            }
-         });
+         // sourcePanel.getLabels().sinkEvents(Event.ONCLICK);
+         // sourcePanel.getLabels().addClickHandler(new ClickHandler()
+         // {
+         // @Override
+         // public void onClick(ClickEvent event)
+         // {
+         // if (targetCellEditor.isOpened())
+         // {
+         // targetCellEditor.savePendingChange(true);
+         // }
+         // }
+         // });
          panel.add(sourcePanel);
          sourcePanelMap.put(rowValue.getId(), panel);