diff --git a/src/org/geometerplus/zlibrary/ui/android/library/BugReportActivity.java b/src/org/geometerplus/zlibrary/ui/android/library/BugReportActivity.java
index beb5ae673..b6efbdb59 100644
--- a/src/org/geometerplus/zlibrary/ui/android/library/BugReportActivity.java
+++ b/src/org/geometerplus/zlibrary/ui/android/library/BugReportActivity.java
@@ -21,6 +21,7 @@ package org.geometerplus.zlibrary.ui.android.library;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
@@ -34,7 +35,8 @@ public class BugReportActivity extends Activity {
 
 	private String getVersionName() {
 		try {
-			return getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
+			final PackageInfo info = getPackageManager().getPackageInfo(getPackageName(), 0);
+			return info.versionName + " (" + info.versionCode + ")";
 		} catch (Exception e) {
 			return "";
 		}
@@ -44,6 +46,7 @@ public class BugReportActivity extends Activity {
 		super.onCreate(icicle);
 		setContentView(R.layout.bug_report_view);
 		final StringBuilder reportText = new StringBuilder();
+
 		reportText.append("Model:").append(Build.MODEL).append("\n");
 		reportText.append("Device:").append(Build.DEVICE).append("\n");
 		reportText.append("Product:").append(Build.PRODUCT).append("\n");
diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
index 504c6fcdf..eac6c9bf2 100644
--- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
+++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
@@ -46,7 +46,7 @@ public final class ZLAndroidLibrary extends ZLibrary {
 	public final ZLIntegerRangeOption BatteryLevelToTurnScreenOffOption = new ZLIntegerRangeOption("LookNFeel", "BatteryLevelToTurnScreenOff", 0, 100, 50);
 	public final ZLBooleanOption DontTurnScreenOffDuringChargingOption = new ZLBooleanOption("LookNFeel", "DontTurnScreenOffDuringCharging", true);
 	public final ZLIntegerRangeOption ScreenBrightnessLevelOption = new ZLIntegerRangeOption("LookNFeel", "ScreenBrightnessLevel", 0, 100, 0);
-	public final ZLBooleanOption DisableButtonLightsOption = new ZLBooleanOption("LookNFeel", "DisableButtonLights", true);
+	public final ZLBooleanOption DisableButtonLightsOption = new ZLBooleanOption("LookNFeel", "DisableButtonLights", !hasButtonLightsBug());
 
 	private boolean hasNoHardwareMenuButton() {
 		return
@@ -67,6 +67,10 @@ public final class ZLAndroidLibrary extends ZLibrary {
 		return myIsKindleFire;
 	}
 
+	public boolean hasButtonLightsBug() {
+		return "GT-S5830".equals(Build.MODEL);
+	}
+
 	private ZLAndroidActivity myActivity;
 	private final Application myApplication;
 	private ZLAndroidWidget myWidget;