diff --git a/matrix_sdk/src/client.rs b/matrix_sdk/src/client.rs
index e928b18e..6e16314c 100644
--- a/matrix_sdk/src/client.rs
+++ b/matrix_sdk/src/client.rs
@@ -2000,7 +2000,7 @@ impl Client {
             #[cfg(feature = "encryption")]
             {
                 // This is needed because sometimes we need to automatically
-                // claim some one-time keys to unwedge an exisitng Olm session.
+                // claim some one-time keys to unwedge an existing Olm session.
                 if let Err(e) = self.claim_one_time_keys([].iter()).await {
                     warn!("Error while claiming one-time keys {:?}", e);
                 }
@@ -2562,7 +2562,10 @@ mod test {
             .create();
 
         if Client::new_from_user_id(alice).await.is_ok() {
-            panic!("Creating a client from a user ID should fail when the .well-known server returns no version infromation.");
+            panic!(
+                "Creating a client from a user ID should fail when the \
+                   .well-known server returns no version information."
+            );
         }
     }
 
diff --git a/matrix_sdk/src/error.rs b/matrix_sdk/src/error.rs
index e2b032ec..b5221376 100644
--- a/matrix_sdk/src/error.rs
+++ b/matrix_sdk/src/error.rs
@@ -122,7 +122,7 @@ pub enum Error {
     #[error(transparent)]
     CryptoStoreError(#[from] CryptoStoreError),
 
-    /// An error occured in the state store.
+    /// An error occurred in the state store.
     #[error(transparent)]
     StateStore(#[from] StoreError),
 
diff --git a/matrix_sdk/src/sas.rs b/matrix_sdk/src/sas.rs
index 17fa8eb7..1556c09d 100644
--- a/matrix_sdk/src/sas.rs
+++ b/matrix_sdk/src/sas.rs
@@ -18,7 +18,7 @@ use matrix_sdk_base::crypto::{
 
 use crate::{error::Result, Client};
 
-/// An object controling the interactive verification flow.
+/// An object controlling the interactive verification flow.
 #[derive(Debug, Clone)]
 pub struct Sas {
     pub(crate) inner: BaseSas,
diff --git a/matrix_sdk/src/verification_request.rs b/matrix_sdk/src/verification_request.rs
index 13b405e8..20924dcc 100644
--- a/matrix_sdk/src/verification_request.rs
+++ b/matrix_sdk/src/verification_request.rs
@@ -18,7 +18,7 @@ use matrix_sdk_base::{
 
 use crate::{room::Joined, Result};
 
-/// An object controling the interactive verification flow.
+/// An object controlling the interactive verification flow.
 #[derive(Debug, Clone)]
 pub struct VerificationRequest {
     pub(crate) inner: BaseVerificationRequest,
diff --git a/matrix_sdk_base/src/rooms/normal.rs b/matrix_sdk_base/src/rooms/normal.rs
index 42dec411..6e2fc03c 100644
--- a/matrix_sdk_base/src/rooms/normal.rs
+++ b/matrix_sdk_base/src/rooms/normal.rs
@@ -486,7 +486,7 @@ pub struct RoomInfo {
     pub summary: RoomSummary,
     /// Flag remembering if the room members are synced.
     pub members_synced: bool,
-    /// The prev batch of this room we received durring the last sync.
+    /// The prev batch of this room we received during the last sync.
     pub last_prev_batch: Option<String>,
     /// Base room info which holds some basic event contents important for the
     /// room state.
diff --git a/matrix_sdk_test/src/lib.rs b/matrix_sdk_test/src/lib.rs
index b86b760d..d5f8fb29 100644
--- a/matrix_sdk_test/src/lib.rs
+++ b/matrix_sdk_test/src/lib.rs
@@ -364,7 +364,7 @@ impl EventBuilder {
     }
 }
 
-/// Embedded sync reponse files
+/// Embedded sync response files
 pub enum SyncResponseFile {
     All,
     Default,