diff --git a/mozilla/extensions/sroaming/plan.txt b/mozilla/extensions/sroaming/plan.txt
index 46e814289cb..e9d0d2a52a6 100644
--- a/mozilla/extensions/sroaming/plan.txt
+++ b/mozilla/extensions/sroaming/plan.txt
@@ -1,11 +1,3 @@
-To do:
-- UI
-  - conflict dialog
-    - column headings
-    - width
-  - listing progressmeter doesn't work
-
-Later:
 - nsiprogresseventsink comment
 - license headers
 - nsresult for internal functions, clean up interfaces
@@ -15,6 +7,7 @@ Later:
 - XXXs
 - clean up progressdialog
 - firebird/thunderbird extension
+- listing progressmeter doesn't work
 
 don't care (for now):
 - conflict
diff --git a/mozilla/extensions/sroaming/resources/content/transfer/conflictResolve.js b/mozilla/extensions/sroaming/resources/content/transfer/conflictResolve.js
index e17d8eff115..36aadd97f0c 100644
--- a/mozilla/extensions/sroaming/resources/content/transfer/conflictResolve.js
+++ b/mozilla/extensions/sroaming/resources/content/transfer/conflictResolve.js
@@ -46,8 +46,6 @@ var gCount = 0; // number of files
 
 function StartUp()
 {
-  //  AddItem (1, "bookmarks", "server", "local");
-  //  return;
   centerWindowOnScreen();
   LoadElements();
   ClearParam();
@@ -66,7 +64,7 @@ function AddItem(fileid, filename, server, local)
       <radiogroup value="2"
                   style="display: -moz-grid-line;
                          -moz-box-orient: horizontal;"
-                  flex="1">   <!-- acts as column-->
+                  flex="1">   <!-- acts as <column> -->
         <description>file description</description>
         <radio label="last modified server, size server" value="1"/>
         <radio label="last modified local, size local" value="2"/>
@@ -75,9 +73,6 @@ function AddItem(fileid, filename, server, local)
   */
 
   var radiogroup = document.createElement("radiogroup");
-  //  radiogroup.setAttribute("orient", "horizontal");
-  radiogroup.setAttribute("style",
-                      "display: -moz-grid-line; -moz-box-orient: horizontal;");
   radiogroup.setAttribute("id", fileid);
   radiogroup.setAttribute("value", gIsDownload ? "2" : "1");
   var cell;
@@ -100,8 +95,10 @@ function AddItem(fileid, filename, server, local)
 
   var rows = document.getElementById("filerows");
   rows.appendChild(radiogroup);
-  //window.style.fontSize="9pt";
-  //window.sizeToContent();
+
+  // WORKAROUND needs to be here, due to bug 209594
+  radiogroup.setAttribute("style",
+                      "display: -moz-grid-line; -moz-box-orient: horizontal;");
 }
 
 function FileLabel(lastModified, size)
diff --git a/mozilla/extensions/sroaming/resources/content/transfer/conflictResolve.xul b/mozilla/extensions/sroaming/resources/content/transfer/conflictResolve.xul
index 1559573868a..eac8f247056 100644
--- a/mozilla/extensions/sroaming/resources/content/transfer/conflictResolve.xul
+++ b/mozilla/extensions/sroaming/resources/content/transfer/conflictResolve.xul
@@ -52,7 +52,7 @@
 <dialog
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
   xmlns:html="http://www.w3.org/1999/xhtml"
-  id="profileWindow"
+  id="conflictResolve"
   class="color-dialog non-resizable"
   title="&windowtitle.label;"
   orient="vertical"
@@ -103,14 +103,6 @@
         <description><html:b>&server.label;</html:b></description>
         <description><html:b>&local.label;</html:b></description>
       </row>
-      <radiogroup style="display: -moz-grid-line;
-                         -moz-box-orient: horizontal;"
-                  flex="1">
-                  <!-- acts as column-->
-        <description>&server.label;</description>
-        <radio label="1a" value="1a"/>
-        <radio label="1b" value="1b"/>
-      </radiogroup>
     </rows>
   </grid>
   </vbox>
@@ -118,96 +110,3 @@
   <separator orient="vertical"/>
   
 </dialog>
-
-
-<!--
-  <html:table>
-    <html:tr>
-      <html:td>A</html:td>
-      <html:td><html:input type="radio" name="a" value="foo" /></html:td>
-      <html:td><html:input type="radio" name="a" value="bar" /></html:td>
-    </html:tr>
-    <html:tr>
-      <html:td>B</html:td>
-      <html:td><html:input type="radio" name="b" value="foo" /></html:td>
-      <html:td><html:input type="radio" name="b" value="bar" /></html:td>
-    </html:tr>
-  </html:table>
-
-  <freeradiogroup id="a" />
-  <grid>
-    <rows>
-      <row flex="1"/>
-    </rows>
-    <columns>
-      <column flex="1">
-        <html>&server.label;</html>
-      </column>
-      <column flex="1">
-        <freeradio label="foo" group="a" />
-      </column>
-      <column flex="1">
-        <freeradio label="bar" group="a" />
-      </column>
-    </columns>
-  </grid>
-
-  <grid>
-    <rows>
-      <row flex="1"/>
-    </rows>
-    <columns>
-      <column id="filename" flex="1">
-        <html>&server.label;</html>
-      </column>
-      <column flex="1">
-        <html:input type="radio" name="a" value="foo" /> foo
-      </column>
-      <column flex="1">
-        <html:input type="radio" name="a" value="bar" /> foo
-      </column>
-    </columns>
-  </grid>
-
-  <grid>
-    <rows>
-      <row flex="1"/>
-    </rows>
-    <columns>
-      <column id="filename" flex="1">
-        <html>&server.label;</html>
-      </column>
-      <column id="server" flex="1">
-        <hbox>
-          <html>&server.label;</html>
-        </hbox>
-      </column>
-      <column id="local" flex="1">
-        <hbox>
-          <html>&local.label;</html>
-        </hbox>
-      </column>
-    </columns>
-  </grid>
-
-      <column id="filename" flex="1">
-        <html>&server.label;</html>
-      </column>
-      <radiogroup>
-      <column id="server" flex="1">
-        <radio label="foo"/>
-      </column>
-      <column id="local" flex="1">
-        <radio label="bar"/>
-      </column>
-      </radiogroup>
-
-      <row flex="1"/>
-      <row flex="1">
-        <html>&server.label;</html>
-        <hbox>
-          <html>&server.label;</html>
-          <html>&local.label;</html>
-        </hbox>
-      </row>
--->