diff --git a/plugins/kolab_activesync/kolab_activesync.js b/plugins/kolab_activesync/kolab_activesync.js
index 5cf9e31f..b7ad998b 100644
--- a/plugins/kolab_activesync/kolab_activesync.js
+++ b/plugins/kolab_activesync/kolab_activesync.js
@@ -52,11 +52,11 @@ function kolab_activesync_config()
         .closest('table').find('input.'+classname).prop('checked', check).change();
     });
 
-    // select the one and only device from list
-    if (rcmail.env.devicecount == 1) {
-        for (var imei in rcmail.env.devices)
-            break;
-        devicelist.select(imei);
+    // select first device
+    if (rcmail.env.devicecount) {
+      for (var imei in rcmail.env.devices)
+        break;
+      devicelist.select(imei);
     }
 
     /* private methods */
diff --git a/plugins/kolab_activesync/localization/de_CH.inc b/plugins/kolab_activesync/localization/de_CH.inc
index f0abdbf5..bd351271 100644
--- a/plugins/kolab_activesync/localization/de_CH.inc
+++ b/plugins/kolab_activesync/localization/de_CH.inc
@@ -21,7 +21,6 @@ $labels['note'] = 'Notizen';
 $labels['deletedevice'] = 'Gerät löschen';
 $labels['imageformat'] = 'Bildformat';
 $labels['laxpiclabel'] = 'PNG- und GIF-Bilder erlauben';
-$labels['introtext'] = 'Wählen Sie das zu konfigurierende Gerät aus';
 $labels['nodevices'] = 'Es sind noch keine Geräte registriert.<br/><br/>Um ein neues Gerät anzumelden, verbinden Sie dieses zuerst mit dem Server. Eine Anleitung dazu finden Sie im <a href="http://wiki.kolab.org/Z_push#Clients">Wiki</a>. Anschliessend laden Sie diese Seite neu und das Gerät wird hier aufgelistet.';
 $labels['savingdata'] = 'Daten werden gespeichert...';
 $labels['savingerror'] = 'Fehler beim Speichern';
diff --git a/plugins/kolab_activesync/localization/de_DE.inc b/plugins/kolab_activesync/localization/de_DE.inc
index f0abdbf5..bd351271 100644
--- a/plugins/kolab_activesync/localization/de_DE.inc
+++ b/plugins/kolab_activesync/localization/de_DE.inc
@@ -21,7 +21,6 @@ $labels['note'] = 'Notizen';
 $labels['deletedevice'] = 'Gerät löschen';
 $labels['imageformat'] = 'Bildformat';
 $labels['laxpiclabel'] = 'PNG- und GIF-Bilder erlauben';
-$labels['introtext'] = 'Wählen Sie das zu konfigurierende Gerät aus';
 $labels['nodevices'] = 'Es sind noch keine Geräte registriert.<br/><br/>Um ein neues Gerät anzumelden, verbinden Sie dieses zuerst mit dem Server. Eine Anleitung dazu finden Sie im <a href="http://wiki.kolab.org/Z_push#Clients">Wiki</a>. Anschliessend laden Sie diese Seite neu und das Gerät wird hier aufgelistet.';
 $labels['savingdata'] = 'Daten werden gespeichert...';
 $labels['savingerror'] = 'Fehler beim Speichern';
diff --git a/plugins/kolab_activesync/localization/en_US.inc b/plugins/kolab_activesync/localization/en_US.inc
index 2537d4d5..be9fdf2d 100644
--- a/plugins/kolab_activesync/localization/en_US.inc
+++ b/plugins/kolab_activesync/localization/en_US.inc
@@ -22,7 +22,6 @@ $labels['configuration'] = 'Configuration';
 $labels['deletedevice'] = 'Delete device';
 $labels['imageformat'] = 'Image format';
 $labels['laxpiclabel'] = 'Allow PNG and GIF images';
-$labels['introtext'] = 'Select a device to configure';
 $labels['nodevices'] = 'There are currently no devices registered.<br/><br/>In order to register a device, please connect it to the server first, using <a href="http://wiki.kolab.org/Z_push#Clients">the instructions in the Wiki</a>. Afterwards the device should become available for configuration here.';
 $labels['savingdata'] = 'Saving data...';
 $labels['savingerror'] = 'Failed to save configuration';
diff --git a/plugins/kolab_activesync/localization/pl_PL.inc b/plugins/kolab_activesync/localization/pl_PL.inc
index 53b5faf2..980c3200 100644
--- a/plugins/kolab_activesync/localization/pl_PL.inc
+++ b/plugins/kolab_activesync/localization/pl_PL.inc
@@ -21,7 +21,6 @@ $labels['note'] = 'Notatki';
 $labels['deletedevice'] = 'Usuń urządzenie';
 $labels['imageformat'] = 'Format obrazka';
 $labels['laxpiclabel'] = 'Zezwalaj na obrazki PNG i GIF';
-$labels['introtext'] = 'Wybierz urządzenie do skonfigurowania';
 $labels['nodevices'] = 'Obecnie brak zarejestrowanych urządzeń.<br/><br/>Aby zarejestrować urządzenie najpierw podłącz je do serwera według <a href="http://wiki.kolab.org/Z_push#Clients">instrukcji z Wiki</a>. Po tym procesie urządzenie powinno dać się skonfigurować tutaj.';
 $labels['savingdata'] = 'Zapisywanie danych...';
 $labels['savingerror'] = 'Nie udało się zapisać konfiguracji';
diff --git a/plugins/kolab_activesync/package.xml b/plugins/kolab_activesync/package.xml
index bd25ca95..464dc79b 100644
--- a/plugins/kolab_activesync/package.xml
+++ b/plugins/kolab_activesync/package.xml
@@ -19,7 +19,7 @@
 		<email>bruederli@kolabsys.com</email>
 		<active>yes</active>
 	</lead>
-	<date>2012-07-30</date>
+	<date>2012-07-02</date>
 	<version>
 		<release>1.0</release>
 		<api>1.0</api>
diff --git a/plugins/kolab_activesync/skins/classic/templates/config.html b/plugins/kolab_activesync/skins/classic/templates/config.html
index 13a98498..87ef4630 100644
--- a/plugins/kolab_activesync/skins/classic/templates/config.html
+++ b/plugins/kolab_activesync/skins/classic/templates/config.html
@@ -41,11 +41,7 @@
 	</form>
 	<div id="introtext">
 		<div class="inner"><div class="bordered">
-			<roundcube:if condition="env:devicecount" />
-				<roundcube:label name="kolab_activesync.introtext" />
-			<roundcube:else />
-				<roundcube:label name="kolab_activesync.nodevices" html="true" />
-			<roundcube:endif />
+			<roundcube:label name="kolab_activesync.nodevices" html="true" />
 		</div></div>
 		<div class="pointer-left"></div>
 	</div>
diff --git a/plugins/kolab_activesync/skins/larry/templates/config.html b/plugins/kolab_activesync/skins/larry/templates/config.html
index 6a9d229b..ae43a3d0 100644
--- a/plugins/kolab_activesync/skins/larry/templates/config.html
+++ b/plugins/kolab_activesync/skins/larry/templates/config.html
@@ -43,11 +43,7 @@
 
 	<div id="introtext">
 		<div class="inner">
-			<roundcube:if condition="env:devicecount" />
-				<roundcube:label name="kolab_activesync.introtext" />
-			<roundcube:else />
-				<roundcube:label name="kolab_activesync.nodevices" html="true" />
-			<roundcube:endif />
+			<roundcube:label name="kolab_activesync.nodevices" html="true" />
 		</div>
 		<div class="pointer-left"></div>
 	</div>