diff --git a/lib/src/commands.rs b/lib/src/commands.rs
index da91bde..b7f1ea7 100644
--- a/lib/src/commands.rs
+++ b/lib/src/commands.rs
@@ -35,6 +35,26 @@ impl Command for SyncCommand {
     }
 }
 
+struct EncryptionStatusCommand {}
+impl Command for EncryptionStatusCommand {
+    fn help(&self) -> String {
+        let mut h = vec![];
+        h.push("Check if the wallet is encrypted and if it is locked");
+        h.push("Usage:");
+        h.push("encryptionstatus");
+        h.push("");
+
+        h.join("\n")
+    }
+
+    fn short_help(&self) -> String {
+        "Check if the wallet is encrypted and if it is locked".to_string()
+    }
+
+    fn exec(&self, _args: &[&str], lightclient: &LightClient) -> String {
+        lightclient.do_encryption_status().pretty(2)
+    }
+}
 
 struct SyncStatusCommand {}
 impl Command for SyncStatusCommand {
@@ -731,27 +751,28 @@ impl Command for QuitCommand {
 pub fn get_commands() -> Box<HashMap<String, Box<dyn Command>>> {
     let mut map: HashMap<String, Box<dyn Command>> = HashMap::new();
 
-    map.insert("sync".to_string(),          Box::new(SyncCommand{}));
-    map.insert("syncstatus".to_string(),    Box::new(SyncStatusCommand{}));
-    map.insert("rescan".to_string(),        Box::new(RescanCommand{}));
-    map.insert("help".to_string(),          Box::new(HelpCommand{}));
-    map.insert("balance".to_string(),       Box::new(BalanceCommand{}));
-    map.insert("addresses".to_string(),     Box::new(AddressCommand{}));
-    map.insert("height".to_string(),        Box::new(HeightCommand{}));
-    map.insert("export".to_string(),        Box::new(ExportCommand{}));
-    map.insert("info".to_string(),          Box::new(InfoCommand{}));
-    map.insert("send".to_string(),          Box::new(SendCommand{}));
-    map.insert("save".to_string(),          Box::new(SaveCommand{}));
-    map.insert("quit".to_string(),          Box::new(QuitCommand{}));
-    map.insert("list".to_string(),          Box::new(TransactionsCommand{}));
-    map.insert("notes".to_string(),         Box::new(NotesCommand{}));
-    map.insert("new".to_string(),           Box::new(NewAddressCommand{}));
-    map.insert("seed".to_string(),          Box::new(SeedCommand{}));
-    map.insert("encrypt".to_string(),       Box::new(EncryptCommand{}));
-    map.insert("decrypt".to_string(),       Box::new(DecryptCommand{}));
-    map.insert("unlock".to_string(),        Box::new(UnlockCommand{}));
-    map.insert("lock".to_string(),          Box::new(LockCommand{}));
-    map.insert("fixbip39bug".to_string(),   Box::new(FixBip39BugCommand{}));
+    map.insert("sync".to_string(),              Box::new(SyncCommand{}));
+    map.insert("syncstatus".to_string(),        Box::new(SyncStatusCommand{}));
+    map.insert("encryptionstatus".to_string(),  Box::new(EncryptionStatusCommand{}));
+    map.insert("rescan".to_string(),            Box::new(RescanCommand{}));
+    map.insert("help".to_string(),              Box::new(HelpCommand{}));
+    map.insert("balance".to_string(),           Box::new(BalanceCommand{}));
+    map.insert("addresses".to_string(),         Box::new(AddressCommand{}));
+    map.insert("height".to_string(),            Box::new(HeightCommand{}));
+    map.insert("export".to_string(),            Box::new(ExportCommand{}));
+    map.insert("info".to_string(),              Box::new(InfoCommand{}));
+    map.insert("send".to_string(),              Box::new(SendCommand{}));
+    map.insert("save".to_string(),              Box::new(SaveCommand{}));
+    map.insert("quit".to_string(),              Box::new(QuitCommand{}));
+    map.insert("list".to_string(),              Box::new(TransactionsCommand{}));
+    map.insert("notes".to_string(),             Box::new(NotesCommand{}));
+    map.insert("new".to_string(),               Box::new(NewAddressCommand{}));
+    map.insert("seed".to_string(),              Box::new(SeedCommand{}));
+    map.insert("encrypt".to_string(),           Box::new(EncryptCommand{}));
+    map.insert("decrypt".to_string(),           Box::new(DecryptCommand{}));
+    map.insert("unlock".to_string(),            Box::new(UnlockCommand{}));
+    map.insert("lock".to_string(),              Box::new(LockCommand{}));
+    map.insert("fixbip39bug".to_string(),       Box::new(FixBip39BugCommand{}));
 
     Box::new(map)
 }
diff --git a/lib/src/lightclient.rs b/lib/src/lightclient.rs
index a3c280e..823720d 100644
--- a/lib/src/lightclient.rs
+++ b/lib/src/lightclient.rs
@@ -639,6 +639,14 @@ impl LightClient {
         res
     }
 
+    pub fn do_encryption_status(&self) -> JsonValue {
+        let wallet = self.wallet.read().unwrap();
+        object!{
+            "encrypted" => wallet.is_encrypted(),
+            "locked"    => !wallet.is_unlocked_for_spending()
+        }
+    }
+
     pub fn do_list_transactions(&self) -> JsonValue {
         let wallet = self.wallet.read().unwrap();