From 50fa491c7b4d139e6b1f910b45f54af3d11f24a2 Mon Sep 17 00:00:00 2001
From: Frederic Jacobs <github@fredericjacobs.com>
Date: Thu, 5 Mar 2015 17:38:16 +0100
Subject: [PATCH] Fixes #620

---
 Signal/src/textsecure/Contacts/Threads/TSContactThread.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Signal/src/textsecure/Contacts/Threads/TSContactThread.m b/Signal/src/textsecure/Contacts/Threads/TSContactThread.m
index 45ab34c94..5f0309d19 100644
--- a/Signal/src/textsecure/Contacts/Threads/TSContactThread.m
+++ b/Signal/src/textsecure/Contacts/Threads/TSContactThread.m
@@ -31,7 +31,8 @@
     TSRecipient *recipient = [TSRecipient recipientWithTextSecureIdentifier:contactId withTransaction:transaction];
     
     if (!recipient) {
-        recipient = [[TSRecipient alloc] initWithTextSecureIdentifier:contactId relay:pushSignal.hasRelay?pushSignal.relay:nil];
+        NSString *relay = pushSignal.hasRelay && ![pushSignal.relay isEqualToString:@""]?pushSignal.relay:nil;
+        recipient = [[TSRecipient alloc] initWithTextSecureIdentifier:contactId relay:relay];
         [recipient saveWithTransaction:transaction];
     }