diff --git a/src/deluge_core.cpp b/src/deluge_core.cpp
index cbfb8acd6..d096dce81 100644
--- a/src/deluge_core.cpp
+++ b/src/deluge_core.cpp
@@ -1354,7 +1354,7 @@ static PyObject *torrent_get_trackers(PyObject *self, PyObject *args)
 		for (std::vector<announce_entry>::const_iterator i = h.trackers().begin(); 
 			i != h.trackers().end(); ++i)
 			{
-			trackerslist = trackerslist + i->url +"\r\n";
+			trackerslist = trackerslist + i->url +"\n";
 			}
 		}
 	return Py_BuildValue("s",trackerslist.c_str());
@@ -1362,25 +1362,28 @@ static PyObject *torrent_get_trackers(PyObject *self, PyObject *args)
 
 static PyObject *torrent_replace_trackers(PyObject *self, PyObject *args)
 {
-       python_long unique_ID;
-       const char* tracker;
-       if (!PyArg_ParseTuple(args, "iz", &unique_ID, &tracker))
-               return NULL;
-       long index = get_index_from_unique_ID(unique_ID);
-       if (PyErr_Occurred())
-           return NULL;
+  python_long unique_ID;
+  const char* tracker;
+  if (!PyArg_ParseTuple(args, "iz", &unique_ID, &tracker))
+    return NULL;
+  long index = get_index_from_unique_ID(unique_ID);
+  if (PyErr_Occurred())
+    return NULL;
 
-       torrent_handle& h = M_torrents->at(index).handle;
+  torrent_handle& h = M_torrents->at(index).handle;
 
-        std::vector<libtorrent::announce_entry> trackerlist;
-	std::istringstream file(tracker);
-	std::string line; 
-	while(std::getline(file, line)){
-	trackerlist.push_back(line);
-	}
-	h.replace_trackers(trackerlist);
-	h.force_reannounce();
-	return Py_None;
+  std::vector<libtorrent::announce_entry> trackerlist;
+	
+  std::istringstream trackers(tracker);
+  std::string line;
+	
+  while (std::getline(trackers, line)) {
+    libtorrent::announce_entry a_entry(line);
+    trackerlist.push_back(a_entry);
+  }
+  h.replace_trackers(trackerlist);
+  h.force_reannounce();
+  return Py_None;
 }
 //====================
 // Python Module data
diff --git a/src/interface.py b/src/interface.py
index e58202e6a..cc17942d5 100644
--- a/src/interface.py
+++ b/src/interface.py
@@ -322,36 +322,26 @@ class DelugeGTK:
 
 	def accept_edit_window(self,arg=None):
 		torrent = self.get_selected_torrent()
-		self.newlist = self.edit_list.get_buffer()
-		self.start = self.textbuffer.get_start_iter()
-		self.end = self.textbuffer.get_end_iter()
-		self.contents = self.textbuffer.get_text(self.start,self.end,include_hidden_chars=False)
-		self.new_contents = []
-		for line in self.contents:
-			if not line.strip():
-				continue
-			else:
-			        self.new_contents.append(line)
-		self.textlist = "".join(self.new_contents)
+		self.textlist = self.textbuffer.get_text(self.textbuffer.get_start_iter(), self.textbuffer.get_end_iter(), include_hidden_chars=False).strip()
 		self.manager.replace_trackers(torrent, self.textlist)
 		self.edit_window.destroy()
 
 	def show_edit_tracker_dialog(self,list):
 		self.textbuffer = gtk.TextBuffer(table=None)
 		self.textbuffer.set_text(list)
-                self.edit_glade = gtk.glade.XML(common.get_glade_file("edit_trackers.glade"))
-                self.edit_list  = self.edit_glade.get_widget("txt_tracker_list")
+		self.edit_glade = gtk.glade.XML(common.get_glade_file("edit_trackers.glade"))
+		self.edit_list  = self.edit_glade.get_widget("txt_tracker_list")
 		self.edit_list.set_buffer(self.textbuffer)
-                self.edit_window  = self.edit_glade.get_widget("edittrackers")
-                self.edit_window.set_position(gtk.WIN_POS_CENTER_ALWAYS)
-                self.edit_window.set_size_request(400, 200)
+		self.edit_window  = self.edit_glade.get_widget("edittrackers")
+		self.edit_window.set_position(gtk.WIN_POS_CENTER_ALWAYS)
+		self.edit_window.set_size_request(400, 200)
 		self.edit_glade.signal_autoconnect({"cancel_button_clicked": self.cancel_edit_window,
 						"ok_button_clicked": self.accept_edit_window 
 						})
 
 		self.edit_window.show_all() 
 
-                return True
+		return True
 
 
 	def tray_clicked(self, status_icon):