diff --git a/anki/deck.py b/anki/deck.py
index 97bf20229..2e85ead1e 100644
--- a/anki/deck.py
+++ b/anki/deck.py
@@ -432,7 +432,7 @@ new cards</a> waiting''') % {
                 msg = (_("The next card will be shown in <b>%s</b>") %
                        self.earliestTimeStr())
         else:
-            msg = _("The deck is empty. Please add some cards.")
+            msg = _("No cards are due.")
         return msg
 
     def earliestTime(self):
diff --git a/anki/sync.py b/anki/sync.py
index 7102cf8d5..76e16eb73 100644
--- a/anki/sync.py
+++ b/anki/sync.py
@@ -874,6 +874,7 @@ class HttpSyncServerProxy(SyncServer):
                             libanki=anki.version,
                             client=clientVersion,
                             sources=simplejson.dumps(self.sourcesToCheck))
+            socket.setdefaulttimeout(None)
             if d['status'] != "OK":
                 raise SyncError(type="authFailed", status=d['status'])
             self._mediaSupported = d['mediaSupported']
diff --git a/anki/utils.py b/anki/utils.py
index 4cdf1725f..eaecc9b0f 100644
--- a/anki/utils.py
+++ b/anki/utils.py
@@ -90,6 +90,9 @@ def parseTags(tags):
     tags = [tag.strip() for tag in tags if tag.strip()]
     return tags
 
+def joinTags(tags):
+    return ", ".join(tags)
+
 def findTag(tag, tags):
     "True if TAG is in TAGS. Ignore case."
     return tag.lower() in [t.lower() for t in tags]