diff -Nru emesene-1.6.3+r2041~ppalucid1/bzr-ssh-key emesene-1.6.3+r2042~ppalucid1/bzr-ssh-key
--- emesene-1.6.3+r2041~ppalucid1/bzr-ssh-key	1970-01-01 01:00:00.000000000 +0100
+++ emesene-1.6.3+r2042~ppalucid1/bzr-ssh-key	2010-08-22 18:41:40.000000000 +0100
@@ -0,0 +1,15 @@
+The key fingerprint is:
+49:bd:2e:ec:bf:4b:90:d2:16:2a:b0:48:d5:2e:98:10 bjfs@amilo
+The key's randomart image is:
++--[ RSA 2048]----+
+|E. ..            |
+|. .  .   .       |
+|..+ .   o .      |
+|.+ + . + + .     |
+|. . o o S .      |
+|     . + o       |
+|        o o      |
+|       . o       |
+|        ..+o     |
++-----------------+
+
diff -Nru emesene-1.6.3+r2041~ppalucid1/debian/changelog emesene-1.6.3+r2042~ppalucid1/debian/changelog
--- emesene-1.6.3+r2041~ppalucid1/debian/changelog	2010-07-25 14:42:57.000000000 +0100
+++ emesene-1.6.3+r2042~ppalucid1/debian/changelog	2010-08-22 18:53:34.000000000 +0100
@@ -1,3 +1,9 @@
+emesene (1.6.3+r2042~ppalucid1) lucid; urgency=low
+
+  * New upstream version. 
+
+ -- B.J. Stobiecki <bartek@stobiecki.eu>  Sun, 22 Aug 2010 19:53:07 +0200
+
 emesene (1.6.3+r2041~ppalucid1) lucid; urgency=low
 
   * New upstream version. 
diff -Nru emesene-1.6.3+r2041~ppalucid1/debian/patches/version.patch emesene-1.6.3+r2042~ppalucid1/debian/patches/version.patch
--- emesene-1.6.3+r2041~ppalucid1/debian/patches/version.patch	2010-07-25 14:42:07.000000000 +0100
+++ emesene-1.6.3+r2042~ppalucid1/debian/patches/version.patch	2010-08-22 18:51:29.000000000 +0100
@@ -7,7 +7,7 @@
  
          self.NAME = 'emesene'
 -        self.VERSION = '1.6.X - "Uberlândia undrgz" BETAFIX?'
-+        self.VERSION = '1.6-dev PPA-r2041'
++        self.VERSION = '1.6-dev PPA-r2042'
          self.COPYRIGHT = 'Luis Mariano Guerra, dx, C10uD, arielj'
          self.COMMENT = _('A client for the WLM%s network') % u'\u2122'
          self.LICENSE_FALLBACK = 'GNU General Public License'
diff -Nru emesene-1.6.3+r2041~ppalucid1/PreferenceWindow.py emesene-1.6.3+r2042~ppalucid1/PreferenceWindow.py
--- emesene-1.6.3+r2041~ppalucid1/PreferenceWindow.py	2010-07-25 13:44:01.000000000 +0100
+++ emesene-1.6.3+r2042~ppalucid1/PreferenceWindow.py	2010-08-22 10:17:58.000000000 +0100
@@ -549,7 +549,10 @@
         if not index == None:
             layoutChooser.set_active(index)
         else:
-            layoutChooser.set_active(self.convDefaultIndex)
+            if self.convDefaultIndex is not None:
+                layoutChooser.set_active(self.convDefaultIndex)
+            else:
+                layoutChooser.set_active(0)
         layoutChooser.connect('changed',self.setLayout)
 
         ''' CONVERSATION PREVIEW '''