diff --git a/src/addresses.py b/src/addresses.py
index a6a571f6..00a2df83 100644
--- a/src/addresses.py
+++ b/src/addresses.py
@@ -276,7 +276,7 @@ if __name__ == "__main__":
     print 'Ripe digest that we will encode in the address:', ripe.digest().encode('hex')
     returnedAddress = encodeAddress(addressVersionNumber,streamNumber,ripe.digest())
     print 'Encoded address:', returnedAddress
-    status,addressVersionNumber,streamNumber,data = decodeAddress(returnedAddress)
+    status,addressVersionNumber,streamNumber,data = decodeAddress("oriDZJ7VAEjphwQmt7fACFqZJVwds26vW")
     print '\nAfter decoding address:'
     print 'Status:', status
     print 'addressVersionNumber', addressVersionNumber
diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py
index d0ef7222..b51c73fc 100755
--- a/src/bitmessagemain.py
+++ b/src/bitmessagemain.py
@@ -1072,7 +1072,7 @@ class receiveDataThread(threading.Thread):
 
                 toLabel = shared.config.get(toAddress, 'label')
                 if toLabel == '':
-                    toLabel = addressInKeysFile
+                    toLabel = toAddress
 
                 if messageEncodingType == 2:
                     bodyPositionIndex = string.find(message,'\nBody:')